From 786eb9ec2bdd4221d38e12c14861804556676e57 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Apr 26 2013 15:31:14 +0000 Subject: Update to 4.5.0 --- diff --git a/.gitignore b/.gitignore index fafdaeb..002e9e8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kdevelop-4.4.0.tar.bz2 /kdevelop-4.4.1.tar.bz2 /kdevelop-4.4.90.tar.bz2 +/kdevelop-4.5.0.tar.bz2 diff --git a/kdevelop-4.4.90-no-rpath.patch b/kdevelop-4.4.90-no-rpath.patch deleted file mode 100644 index 0d8f205..0000000 --- a/kdevelop-4.4.90-no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdevelop-4.4.90/CMakeLists.txt 2013-04-18 02:19:29.000000000 +0200 -+++ kdevelop-4.4.90_patch/CMakeLists.txt 2013-04-26 08:28:26.779838706 +0200 -@@ -23,7 +23,7 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_D - if("${_isSystemLibDir}" STREQUAL "-1") - set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") - endif("${_isSystemLibDir}" STREQUAL "-1") --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - find_package(KDevPlatform 1.4.60 REQUIRED) - diff --git a/kdevelop-4.5.0-no-rpath.patch b/kdevelop-4.5.0-no-rpath.patch new file mode 100644 index 0000000..0d8f205 --- /dev/null +++ b/kdevelop-4.5.0-no-rpath.patch @@ -0,0 +1,11 @@ +--- kdevelop-4.4.90/CMakeLists.txt 2013-04-18 02:19:29.000000000 +0200 ++++ kdevelop-4.4.90_patch/CMakeLists.txt 2013-04-26 08:28:26.779838706 +0200 +@@ -23,7 +23,7 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_D + if("${_isSystemLibDir}" STREQUAL "-1") + set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") + endif("${_isSystemLibDir}" STREQUAL "-1") +-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + find_package(KDevPlatform 1.4.60 REQUIRED) + diff --git a/kdevelop.spec b/kdevelop.spec index f9654e6..3ec8dd4 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,11 +1,11 @@ -%define kdevplatform_ver 1.4.90 +%define kdevplatform_ver 1.5.0 Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 4.4.90 -Release: 2%{?dist} +Version: 4.5.0 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -14,7 +14,7 @@ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line -Patch0: kdevelop-4.4.90-no-rpath.patch +Patch0: kdevelop-4.5.0-no-rpath.patch # upstreamable patches @@ -157,6 +157,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %changelog +* Fri Apr 26 2013 Jan Grulich - 9:4.5.0-1 +- Update to 4.5.0 + * Fri Apr 26 2013 Jan Grulich - 9:4.4.90-2 - Add previusly removed rpath patch diff --git a/sources b/sources index c8f0878..2894f57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b792caccd920135a3e4cc279535820ce kdevelop-4.4.90.tar.bz2 +7a16db527e0565e435975e929b682af3 kdevelop-4.5.0.tar.bz2