Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2013-01-24 10:37:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2013-01-19 16:39:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2013-01-24 10:38:01.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Jan 18 15:35:54 UTC 2013 - [email protected] + +- Add alternatives support for co-installability +- Build with -DPYKDEUIC4_ALTINSTALL=TRUE to let %post generate the + command +- Use %{py_ver} instead of hardcoding a version + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-kde4/python3-kde4.changes 2013-01-19 16:39:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python3-kde4.changes 2013-01-24 10:38:01.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Jan 18 15:36:56 UTC 2013 - [email protected] + +- Add alternatives support for co-installability +- Build with -DPYKDEUIC4_ALTINSTALL=TRUE to let %post generate the + command +- Use %{py3_ver} instead of hardcoding a version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.KXXh0Q/_old 2013-01-24 10:38:01.000000000 +0100 +++ /var/tmp/diff_new_pack.KXXh0Q/_new 2013-01-24 10:38:01.000000000 +0100 @@ -32,6 +32,7 @@ BuildRequires: okular-devel BuildRequires: python-qt4-devel BuildRequires: xz +Requires: update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %kde4_runtime_requires @@ -63,17 +64,27 @@ %setup -q -n pykde4-%{version} %build - %cmake_kde4 -d build -- -DPYKDEUIC4_ALTINSTALL=FALSE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE + %cmake_kde4 -d build -- -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE %make_jobs %install cd build + %kde4_makeinstall %fdupes -s %{buildroot}%{_datadir} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-alternatives --install %{_bindir}/pykdeuic4 pykdeuic4 %{_bindir}/pykdeuic4-%{py_ver} 50 + +%postun +/sbin/ldconfig + +update-alternatives --remove pykdeuic4 %{_bindir}/pykdeuic4-%{py_ver} + +if [ -e "%{_sysconfdir}/alternatives/pykdeuic4" ]; then + update-alternatives --auto pykdeuic4 +fi %files %defattr(-,root,root) @@ -81,8 +92,7 @@ %exclude %{_kde4_appsdir}/pykde4/examples %{_kde4_appsdir}/pykde4 %{_kde4_modulesdir}/kpythonpluginfactory.so -%{_kde4_bindir}/pykdeuic4-2.7 -%{_kde4_bindir}/pykdeuic4 +%{_kde4_bindir}/pykdeuic4-%{py_ver} %{py_sitedir}/PyQt4/uic/widget-plugins %{py_sitedir}/PyQt4/uic/pykdeuic4.* ++++++ python3-kde4.spec ++++++ --- /var/tmp/diff_new_pack.KXXh0Q/_old 2013-01-24 10:38:01.000000000 +0100 +++ /var/tmp/diff_new_pack.KXXh0Q/_new 2013-01-24 10:38:01.000000000 +0100 @@ -34,6 +34,7 @@ BuildRequires: python3-qt4-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: update-alternatives %py_requires %kde4_runtime_requires %kde4_akonadi_requires @@ -56,7 +57,7 @@ %setup -q -n pykde4-%{version} %build - %cmake_kde4 -d build -- -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYKDEUIC4_ALTINSTALL=FALSE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE + %cmake_kde4 -d build -- -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE %make_jobs %install @@ -66,16 +67,24 @@ rm -rf %{buildroot}%{_datadir}/sip/PyKDE4 rm -rf %{buildroot}%{_kde4_appsdir}/pykde4/examples -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +update-alternatives --install %{_bindir}/pykdeuic4 pykdeuic4 %{_bindir}/pykdeuic4-%{py3_ver} 40 + +%postun +/sbin/ldconfig + +update-alternatives --remove pykdeuic4 %{_bindir}/pykdeuic4-%{py_ver} + +if [ -e "%{_sysconfdir}/alternatives/pykdeuic4" ]; then + update-alternatives --auto pykdeuic4 +fi %files %defattr(-,root,root) %{python3_sitearch}/PyKDE4 %{_kde4_appsdir}/pykde4 -%{_kde4_bindir}/pykdeuic4 -%{_kde4_bindir}/pykdeuic4-3.3 +%{_kde4_bindir}/pykdeuic4-%{py3_ver} %{python3_sitearch}/PyQt4/uic/widget-plugins %{python3_sitearch}/PyQt4/uic/pykdeuic4.* %{python3_sitearch}/PyQt4/uic/__pycache__/ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
