[pykde4] fixup/cleanup pykdeuic4 naming and multilib-hackery

[Rex Dieter]

commit f93bab5c11594970f98a8a67e4d83d1313a827b4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 4 11:49:15 2013 -0600

    fixup/cleanup pykdeuic4 naming and multilib-hackery

 pykde4.spec |   53 ++++++++++++++++++++---------------------------------
 1 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/pykde4.spec b/pykde4.spec
index b0726ba..d734dd3 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -1,7 +1,6 @@
 %define pykde4_akonadi 1
 %define pyqt4_version_min 4.9.5
 %define sip_version_min 4.14
-%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %if 0%{?fedora} > 17
 # needs kdelibs-4.9.2-6+
 %define python3 1
@@ -9,7 +8,7 @@
 
 Name:    pykde4 
 Version: 4.9.97
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python bindings for KDE4 
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -42,8 +41,7 @@ BuildRequires: PyQt4-devel >= %{pyqt4_version_min}, sip-devel >= %{sip_version_m
 %if 0%{?python3}
 BuildRequires: python3-devel
 BuildRequires: python3-PyQt4-devel >= %{pyqt4_version_min}, python3-sip-devel >= %{sip_version_min}
-%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")
-%global python3_ver %(%{__python3} -c "import sys ; print (\\"%s%s\\" % (sys.version[:3],getattr(sys,'abiflags','')))")
+%global python3_abiflags %(%{__python3} -c "import sys ; print (\\"%s\\" % (getattr(sys,'abiflags','')))")
 %global python3_pyqt4_version %(%{__python3} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
 %endif
 %if 0%{?fedora}
@@ -144,16 +142,13 @@ Provides:  python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
 %patch300 -p1 -b .webkit
 %endif
 
+
 %build
 %if 0%{?python3}
 mkdir -p %{_target_platform}-python3
 pushd    %{_target_platform}-python3
 %{cmake_kde4} \
   -DPYTHON_EXECUTABLE:PATH=%{__python3} \
-  -DPython_ADDITIONAL_VERSIONS=%{python3_ver} \
-  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_ver}.so.1.0 \
-  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python3_ver}.so.1.0 \
-  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python3_ver} \
   ..
 
 make %{?_smp_mflags}
@@ -163,19 +158,14 @@ popd
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python_ver}.so.1.0 \
-  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python_ver}.so.1.0 \
-  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python_ver} \
+  -DPYTHON_EXECUTABLE:PATH=%{__python} \
   ..
   
-  make %{?_smp_mflags}
+make %{?_smp_mflags}
 popd
  
 
-
 %install
-rm -rf %{buildroot}
-
 %if 0%{?python3}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-python3
 
@@ -183,35 +173,31 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-python3
 rm -fv %{buildroot}%{_kde4_libdir}/kde4/kpythonpluginfactory.so 
 
 # HACK: fix multilib conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
-rm -fv %{buildroot}%{_bindir}/pykdeuic4
+rm -fv %{buildroot}%{_bindir}/pykdeuic4-%{python3_version}
 mv %{buildroot}%{python3_sitearch}/PyQt4/uic/pykdeuic4.py \
-   %{buildroot}%{_bindir}/python3-pykdeuic4
-ln -s %{_bindir}/python3-pykdeuic4 \
+   %{buildroot}%{_bindir}/pykdeuic4-%{python3_version}
+ln -s %{_bindir}/pykdeuic4-%{python3_version} \
       %{buildroot}%{python3_sitearch}/PyQt4/uic/pykdeuic4.py
 
 # install pykde4 examples under correct dir
-mkdir -p %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_docdir}/python3-pykde4
 rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
-mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/python3-pykde4
+mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/python3-pykde4/
 %endif
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # HACK: fix multilib conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
-rm -fv %{buildroot}%{_bindir}/pykdeuic4
+rm -fv %{buildroot}%{_bindir}/pykdeuic4-%{python_version}
 mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
-   %{buildroot}%{_bindir}/pykdeuic4
-ln -s %{_bindir}/pykdeuic4 \
+   %{buildroot}%{_bindir}/pykdeuic4-%{python_version}
+ln -s %{_bindir}/pykdeuic4-%{python_version} \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
 # install pykde4 examples under correct dir
-mkdir -p %{buildroot}%{_docdir}
+mkdir -p %{buildroot}%{_docdir}/pykde4
 rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
-mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
-
-
-%clean
-rm -rf %{buildroot}
+mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %files 
@@ -227,8 +213,7 @@ rm -rf %{buildroot}
 %endif
 
 %files devel
-%{_kde4_bindir}/pykdeuic4
-%{_kde4_bindir}/pykdeuic4-2.*
+%{_kde4_bindir}/pykdeuic4-%{python_version}
 %{python_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{_docdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
@@ -247,8 +232,7 @@ rm -rf %{buildroot}
 %endif
 
 %files -n python3-pykde4-devel
-%{_kde4_bindir}/python3-pykdeuic4
-%{_kde4_bindir}/pykdeuic4-3.*
+%{_kde4_bindir}/pykdeuic4-%{python3_version}
 %{python3_sitearch}/PyQt4/uic/pykdeuic4.py*
 %{python3_sitearch}/PyQt4/uic/__pycache__/
 %{_docdir}/python3-pykde4/examples/
@@ -257,6 +241,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.97-2
+- fixup/cleanup pykdeuic4 naming and multilib-hackery
+
 * Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.97-1
 - 4.9.97