[kdebindings] pykdeui no longer exists (re)enable polkit-qt support

Rex Dieter rdieter at fedoraproject.org
Fri Jan 7 21:48:35 UTC 2011


commit a0fb71bea991a69239a81abc4069a6c4dbf7abae
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 7 15:47:22 2011 -0600

    pykdeui no longer exists
    (re)enable polkit-qt support

 kdebindings.spec |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/kdebindings.spec b/kdebindings.spec
index a8247b7..9d6888e 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -64,8 +64,7 @@ BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 # kate bindings
 BuildRequires:  kdesdk-devel >= %{version}
-# kdebindings does not support polkit-qt-1 yet
-#BuildRequires:  polkit-qt-devel
+BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version_min}, sip-devel >= %{sip_version_min}
 BuildRequires:  qimageblitz-devel
@@ -307,9 +306,9 @@ pushd %{_target_platform}
   ..
 popd
 
-# smp build not recommended (upstream)
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
@@ -318,13 +317,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 rm -rf %{buildroot}%{_kde4_datadir}/sip/PyKDE4/polkitqt/
 rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples/polkitqtExamples/
 
-# 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 -f %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
@@ -347,11 +339,6 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%pre -n PyKDE4-devel
-if [ -d %{_bindir}/pykdeuic4 ]; then
-rm -rf %{_bindir}/pykdeuic4/
-fi
-
 
 %files
 %defattr(-,root,root,-)
@@ -393,8 +380,6 @@ fi
 
 %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