rpms/kdebindings/devel kdebindings-4.2.96-kdebug#198632.patch, NONE, 1.1 kdebindings.spec, 1.213, 1.214

Rex Dieter rdieter at fedoraproject.org
Thu Jul 16 17:48:42 UTC 2009


Author: rdieter

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.2.96-kdebug#198632.patch 
Log Message:
* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
- fix pykdeuic4-related install bits (kdebug#198162)


kdebindings-4.2.96-kdebug#198632.patch:

--- NEW FILE kdebindings-4.2.96-kdebug#198632.patch ---
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.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdebindings.spec	10 Jul 2009 14:47:23 -0000	1.213
+++ kdebindings.spec	16 Jul 2009 17:48:12 -0000	1.214
@@ -33,7 +33,7 @@
 
 Name: kdebindings
 Version: 4.2.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -48,15 +48,17 @@ 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
+# http://bugs.kde.org/198632#c5
+Patch50:  kdebindings-4.2.96-kdebug#198632.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
-BuildRequires:  kdebase-workspace-devel >= %{version}
+#BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
-BuildRequires:  kdegraphics-devel >= %{version}
-BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  kdepimlibs-devel >= %{version}
+#BuildRequires:  kdegraphics-devel >= %{version}
+#BuildRequires:  kdelibs4-devel >= %{version}
+#BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
@@ -253,6 +255,7 @@ Falcon plugin for the Kross archtecture 
 %patch0
 %patch1 -p0 -b .old-PyQt4
 %patch2 -p1 -b .fix-kpythonpluginfactory
+%patch50 -p1 -b .kdebug#198632
 
 
 %build
@@ -330,6 +333,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{python_sitearch}/PyKDE4/
+%{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
 %dir %{_kde4_appsdir}/pykde4/
 %{_kde4_appsdir}/pykde4/*.py*
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
@@ -343,6 +347,7 @@ rm -rf %{buildroot}
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
+%{_kde4_bindir}/pykdeuic4
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
@@ -487,6 +492,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- fix pykdeuic4-related install bits (kdebug#198162)
+
 * Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
 - 4.3rc2
 




More information about the fedora-extras-commits mailing list