rpms/kdebindings/devel kdebindings-4.3.0-kdebug#198632.patch, NONE, 1.1 kdebindings.spec, 1.227, 1.228

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.0-kdebug#198632.patch 
Log Message:
more pykdeuic4 and related multilib love (kdebug#198162)


kdebindings-4.3.0-kdebug#198632.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.0-kdebug#198632.patch ---
Index: kdebindings/python/pykde4/tools/pykdeuic4/CMakeLists.txt
===================================================================
--- kdebindings/python/pykde4/tools/pykdeuic4/CMakeLists.txt    (revision 1004600)
+++ kdebindings/python/pykde4/tools/pykdeuic4/CMakeLists.txt    (working copy)
@@ -1,2 +1,4 @@
 PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
-PYTHON_INSTALL(pykdeuic4.py ${BIN_INSTALL_DIR}/pykdeuic4)
+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
+find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- kdebindings.spec	29 Jul 2009 22:37:44 -0000	1.227
+++ kdebindings.spec	30 Jul 2009 15:46:51 -0000	1.228
@@ -49,7 +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
+## upstream patches
+Patch100: kdebindings-4.3.0-kdebug#198632.patch
 
 
 BuildRequires:  akonadi-devel >= 1.1.0
@@ -256,6 +257,7 @@ Falcon plugin for the Kross archtecture 
 %patch2 -p1 -b .fix-kpythonpluginfactory
 
 # upstream patches
+%patch100 -p1 -b .kdebug#198632
 
 
 %build
@@ -303,6 +305,14 @@ make -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# HACK: fix multilb conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
+rm -fv %{buildroot}%{_bindir}/pykdeuic4
+mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
+   %{buildroot}%{_bindir}/pykdeuic4
+ln -s %{_bindir}/pykdeuic4 \
+      %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -347,6 +357,7 @@ rm -rf %{buildroot}
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
 %{_kde4_bindir}/pykdeuic4
+%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_kde4_appsdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
@@ -493,6 +504,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
+- more pykdeuic4 and related multilib love (kdebug#198162)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild