rpms/kdebindings/devel kdebindings.spec, 1.267, 1.268 kdebindings-4.2.85-old-PyQt4.patch, 1.2, NONE kdebindings-4.3.3-qt46.patch, 1.5, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18272

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.2.85-old-PyQt4.patch 
	kdebindings-4.3.3-qt46.patch 
Log Message:
take out a few patches, try again



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- kdebindings.spec	11 Dec 2009 14:11:00 -0000	1.267
+++ kdebindings.spec	11 Dec 2009 14:50:58 -0000	1.268
@@ -64,12 +64,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
-# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
-Patch1:  kdebindings-4.2.85-old-PyQt4.patch
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # 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
 
@@ -278,13 +278,12 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0
-%patch1 -p0 -b .old-PyQt4
 
 # 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


--- kdebindings-4.2.85-old-PyQt4.patch DELETED ---


--- kdebindings-4.3.3-qt46.patch DELETED ---