rpms/kdebindings/devel kdebindings.spec,1.268,1.269
Kevin Kofler
kkofler at fedoraproject.org
Fri Dec 11 23:06:44 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32617/devel
Modified Files:
kdebindings.spec
Log Message:
Restore the no-rpath hack, it's not what caused the build failure and we're not ready to build without CMAKE_SKIP_RPATH.
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- kdebindings.spec 11 Dec 2009 14:50:58 -0000 1.268
+++ kdebindings.spec 11 Dec 2009 23:06:44 -0000 1.269
@@ -68,8 +68,6 @@ Patch0: kdebindings-qyoto-examples.patc
# WARNING: This is a bunch of quick hacks to get this to build. Please do not
# commit this upstream without further discussion.
Patch2: kdebindings-4.3.75-no-rpath.patch
-# or
-%define _cmake_skip_rpath %{nil}
## upstream patches
@@ -282,8 +280,8 @@ Falcon plugin for the Kross archtecture
# upstream patches
# do the no-rpath hack last, after the upstream backports (if any)
-#patch2 -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
+%patch2 -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
%build
More information about the fedora-extras-commits
mailing list