diff --git a/kdevelop-4.4.0-no-rpath.patch b/kdevelop-4.4.0-no-rpath.patch new file mode 100644 index 0000000..b7cf60a --- /dev/null +++ b/kdevelop-4.4.0-no-rpath.patch @@ -0,0 +1,11 @@ +diff -up kdevelop-4.3.80/CMakeLists.txt.no-rpath kdevelop-4.3.80/CMakeLists.txt +--- kdevelop-4.3.80/CMakeLists.txt.no-rpath 2012-08-09 13:41:43.651354379 +0200 ++++ kdevelop-4.3.80/CMakeLists.txt 2012-08-09 13:41:50.590528091 +0200 +@@ -23,7 +23,6 @@ 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) + + find_package(KDevPlatform 1.3.80 REQUIRED) + diff --git a/kdevelop.spec b/kdevelop.spec index 4dc1ceb..0e50999 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,30 +1,32 @@ -%define kdevplatform_ver 1.3.1 +%define kdevplatform_ver 1.4.0 Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 4.3.1 -Release: 2%{?dist} +Version: 4.4.0 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ Group: Development/Tools -Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/kdevelop/4.4.0/src/kdevelop-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # remove set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) line -Patch0: kdevelop-4.3.0-no-rpath.patch +Patch0: kdevelop-4.4.0-no-rpath.patch # upstreamable patches -Patch100: kdevelop-4.3.0-big_endian.patch +Patch50: kdevelop-4.3.0-big_endian.patch + +# upstream patches BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: kdebase-workspace-devel -BuildRequires: kdevplatform-devel >= %{kdevplatform_ver} -BuildRequires: kdelibs4-devel +BuildRequires: kdevplatform-devel >= %{kdevplatform_ver} +BuildRequires: kdelibs4-devel BuildRequires: okteta-devel # some arches don't have valgrind so we need to disable its support on them %ifarch %{ix86} x86_64 ppc ppc64 s390x @@ -82,7 +84,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %prep %setup -q -n kdevelop-%{version} %patch0 -p1 -b .no-rpath -%patch100 -p1 -b .bigendian +%patch50 -p1 -b .bigendian %build mkdir -p %{_target_platform} @@ -129,14 +131,17 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog TODO NEWS %{_kde4_bindir}/kdevelop -%{_kde4_bindir}/kdevelop_attach +%{_kde4_bindir}/kdevelop! %{_kde4_configdir}/kdeveloprc +%{_kde4_configdir}/kdevelop-qthelp.knsrc %{_kde4_appsdir}/kdev*/ %{_kde4_datadir}/applications/kde4/kdevelop.desktop %{_kde4_datadir}/applications/kde4/kdevelop_ps.desktop %{_kde4_datadir}/kde4/services/*.desktop %{_kde4_datadir}/mime/packages/kdevelop.xml %{_kde4_iconsdir}/hicolor/*/*/* +%{_kde4_appsdir}/plasma/plasmoids/kdevelopsessions/* +%{_kde4_appsdir}/plasma/services/org.kde.plasma.dataengine.kdevelopsessions.operations %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -153,6 +158,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null %changelog +* Thu Oct 23 2012 Jan Grulich 9:4.4.0-1 +- Update to 4.4.0 +- Rebase no-rpath patch + * Mon Sep 10 2012 Rex Dieter 9:4.3.1-2 - rebuild for kde-4.9.x diff --git a/sources b/sources index 1358aa9..9d99f8d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -6126e49562dcfb8e78a0f1b052a1ce19 kdevelop-4.3.1.tar.bz2 +b3c8e3032eb54a074b643d9521e52f5a kdevelop-4.4.0.tar.bz2 +cf69602996066c5e87a0c48c821eb4fd kdevelop-4.4.0-no-rpath.patch