rpms/kdebindings/devel kdebindings-4.2.96-kdebug#198632.patch, 1.2, 1.3 kdebindings.spec, 1.224, 1.225

Rex Dieter rdieter at fedoraproject.org
Thu Jul 23 19:41:34 UTC 2009


Author: rdieter

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.2.96-kdebug#198632.patch 
Log Message:
oops, bringing back patch, it didn't make 4.3 branch in time.


kdebindings-4.2.96-kdebug#198632.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: kdebindings-4.2.96-kdebug#198632.patch
===================================================================
RCS file: kdebindings-4.2.96-kdebug#198632.patch
diff -N kdebindings-4.2.96-kdebug#198632.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kdebindings-4.2.96-kdebug#198632.patch	23 Jul 2009 19:41:33 -0000	1.3
@@ -0,0 +1,9 @@
+diff -up kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632 kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt
+--- kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt.kdebug#198632	2009-03-27 09:46:05.000000000 -0500
++++ kdebindings-4.2.96/python/pykde4/tools/pykdeuic4/CMakeLists.txt	2009-07-16 12:39:38.457647506 -0500
+@@ -1,3 +1,3 @@
+ 
+-PYTHON_INSTALL(kde4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+-PYTHON_INSTALL(pykdeuic4.py ${DATA_INSTALL_DIR}/${PROJECT_NAME})
++PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
++PYTHON_INSTALL(pykdeuic4.py ${BIN_INSTALL_DIR}/pykdeuic4)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- kdebindings.spec	21 Jul 2009 22:13:25 -0000	1.224
+++ kdebindings.spec	23 Jul 2009 19:41:34 -0000	1.225
@@ -40,6 +40,7 @@ License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # patch to disable examples (trouble with them installing to the buildroot)
 Patch0:  kdebindings-qyoto-examples.patch
@@ -48,8 +49,8 @@ Patch1:  kdebindings-4.2.85-old-PyQt4.pa
 # make the Python plugin factory work without python-devel
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 ## upstream patches
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#http://bugs.kde.org/198632#c5 	 
+Patch100: kdebindings-4.2.96-kdebug#198632.patch
 
 BuildRequires:  akonadi-devel >= 1.1.0
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -255,6 +256,7 @@ Falcon plugin for the Kross archtecture 
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
+%patch100 -p1 -b .kdebug#198632
 
 
 %build




More information about the fedora-extras-commits mailing list