rpms/kdebindings/devel kdebindings.spec,1.289,1.290
Rex Dieter
rdieter at fedoraproject.org
Fri Jan 8 16:42:33 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9180
Modified Files:
kdebindings.spec
Log Message:
drop rpath hacks on < f12 (breaks the build)
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- kdebindings.spec 7 Jan 2010 22:22:16 -0000 1.289
+++ kdebindings.spec 8 Jan 2010 16:42:32 -0000 1.290
@@ -78,9 +78,7 @@ BuildRequires: kdebase-workspace-devel
BuildRequires: kdegraphics-devel >= %{version}
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
-%if 0%{?fedora} && 0%{?fedora} < 12
BuildRequires: polkit-qt-devel
-%endif
BuildRequires: python-devel
BuildRequires: PyQt4-devel >= %{pyqt4_version}, sip-devel
BuildRequires: qimageblitz-devel
@@ -280,8 +278,15 @@ Falcon plugin for the Kross archtecture
# upstream patches
# do the no-rpath hack last, after the upstream backports (if any)
+%if 0%{?fedora} > 11
%patch1 -p1 -b .no-rpath
sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
+%else
+# the above breaks < f12 builds , maybe it's time to fix kde4/cmake macros
+# properly to just not rpath stuff in %%_libdir/kde4/devel and stop hard-coding
+# CMAKE_SKIP_RPATH everywhere
+%global _cmake_skip_rpath %{nil}
+%endif
%build
More information about the fedora-extras-commits
mailing list