[kdebindings] fix/revert stuff from before (builds on f14 at least)

Rex Dieter rdieter at fedoraproject.org
Sat Jan 8 21:56:33 UTC 2011


commit df63bcb9c25407068deabaf6abb3ccd9027a238d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 8 15:55:00 2011 -0600

    fix/revert stuff from before (builds on f14 at least)

 kdebindings.spec |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/kdebindings.spec b/kdebindings.spec
index 234ac85..8d3e364 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -16,10 +16,9 @@
 %endif
 
 %define devel 1
-# this has gone awol in 4.5.95, double-check -- Rex
-#define pykde4_akonadi 1
-%define pyqt4_version_min 4.7
-%define sip_version_min 4.11.0
+%define pykde4_akonadi 1
+%define pyqt4_version_min 4.8.2
+%define sip_version_min 4.12
 
 %if 0%{?rhel}
 %define falcon 0
@@ -322,6 +321,18 @@ make %{?_smp_mflags} -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
+
+# install pykde4 examples under correct dir
+mkdir -p %{buildroot}%{_docdir}
+rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
+mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
+
 # bz#551534 - qyoto doesn't pull mono in
 %if 0%{?csharp}
 find %{buildroot} -name \*.dll -not -type l | xargs chmod ugo+x
@@ -368,6 +379,8 @@ rm -rf %{buildroot}
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
+%dir %{_docdir}/pykde4
+%{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
 %exclude %{python_sitearch}/PyKDE4/akonadi.so
@@ -378,6 +391,8 @@ rm -rf %{buildroot}
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
+%{_kde4_bindir}/pykdeuic4
+%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_docdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 


More information about the scm-commits mailing list