Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at 2017-04-28 10:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt4 (Old) and /work/SRC/openSUSE:Factory/.python-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt4" Fri Apr 28 10:42:23 2017 rev:80 rq:489450 version:4.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt4/python-qt4.changes 2017-02-21 13:36:28.273759953 +0100 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python-qt4.changes 2017-04-28 10:42:27.270955436 +0200 @@ -1,0 +2,22 @@ +Wed Apr 19 20:21:31 UTC 2017 - [email protected] + +- Remove unneeded link-python.diff and link-python3.diff. + +------------------------------------------------------------------- +Wed Mar 29 15:09:29 UTC 2017 - [email protected] + +- Temporarily undo some of the single spec changes to allow building + until a newer python-dbus is available + +------------------------------------------------------------------- +Mon Mar 6 20:51:00 UTC 2017 - [email protected] + +- Switch to single-spec version. +- Add rpmlintrc with doc-file-dependency to handle the example + files. +- Switch to using configure-ng.py for all versions. +- Remove unneeded link-python.diff +- Use update-alternatives for all executables. As a result, + executables have been moved to the -devel subpackage. + +------------------------------------------------------------------- Old: ---- link-python.diff link-python3.diff python3-qt4.changes python3-qt4.spec New: ---- python-qt4-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.v8EoGD/_old 2017-04-28 10:42:28.342803935 +0200 +++ /var/tmp/diff_new_pack.v8EoGD/_new 2017-04-28 10:42:28.346803369 +0200 @@ -16,7 +16,7 @@ # -%define rversion %{version} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-qt4 Version: 4.12 Release: 0 @@ -24,28 +24,32 @@ License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree Group: Development/Libraries/Python Url: http://www.riverbankcomputing.com/software/pyqt/intro -Source0: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{rversion}/PyQt4_gpl_x11-%{rversion}.tar.gz -Patch0: link-python.diff +Source: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{version}/PyQt4_gpl_x11-%{version}.tar.gz +Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM: Fix .pro files not being generated by configure.py -Patch3: pyqt4_add_pro_files.diff -BuildRequires: dbus-1-python-devel +Patch0: pyqt4_add_pro_files.diff +BuildRequires: dbus-1-devel BuildRequires: fdupes BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: phonon-devel -BuildRequires: python-devel -BuildRequires: python-sip-devel >= 4.19.1 +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: dbus-1-python-devel +BuildRequires: dbus-1-python3-devel +BuildRequires: %{python_module sip-devel >= 4.19.1} +Requires: %{name}-utils +%ifpython2 %requires_ge dbus-1-python -%requires_ge libqt4-x11 -%py_requires -%{requires_python_sip_api} -%if 0%{?sles_version} == 10 -Requires: python-elementtree +%{requires_python2_sip_api} %endif -%if 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%ifpython3 +%requires_ge dbus-1-python3 +%{requires_python3_sip_api} %endif +%requires_ge libqt4-x11 + +%python_subpackages %description PyQt is a set of Python bindings for Trolltech's Qt application @@ -55,13 +59,23 @@ implemented as a set of Python modules and contain over 300 classes and nearly 6,000 functions and methods. + %package devel Summary: PyQt - devel part of python bindings for Qt 4 Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: libqt4-devel -Requires: python-qt4-utils -Requires: python-sip-devel +Requires: python-devel +%ifpython2 +Requires: dbus-1-python-devel +%endif +%ifpython3 +Requires: dbus-1-python3-devel +%endif +Requires: python-qt4-utils = %{version} +Requires: python-sip-devel >= 4.19.1 +Recommends: python-qscintilla +Requires(post): update-alternatives +Requires(postun): update-alternatives %description devel PyQt is a set of Python bindings for Trolltech's Qt application @@ -74,53 +88,115 @@ This package contains all the developer tools you need to create your own PyQt applications. -%package utils + +%package -n %{name}-utils Summary: Common files for PyQt4 for python2 and python3 Group: Development/Libraries/Python +Requires: dbus-1-devel +Requires: libQtWebKit-devel +Requires: libqt4-devel +Requires: phonon-devel +Provides: %{python_module qt4-utils = %{version}} + +%description -n %{name}-utils +PyQt is a set of Python bindings for Trolltech's Qt application +framework and runs on all platforms supported by Qt including Windows, +MacOS/X and Linux. There are two sets of bindings: PyQt v4 supports Qt +v4; and the older PyQt v3 supports Qt v3 and earlier. The bindings are +implemented as a set of Python modules and contain over 300 classes and +nearly 6,000 functions and methods. + +This package contains common files shared between python2 and python3 +versions of PyQt4. -%description utils -This package is needed to avoid conflicts between python-qt4 and -python3-qt4 packages. It contains files common to both of them i.e. -sip files used to generate bindings and utilities pylupdate4 and pyrcc4 %prep -%setup -q -n PyQt4_gpl_x11-%{rversion} +%setup -q -n PyQt4_gpl_x11-%{version} %patch0 -p1 -%patch3 -p1 + %build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" -python configure.py --confirm-license --qsci-api -u + +%{python_expand mkdir build_%{$python_bin_suffix} +pushd build_%{$python_bin_suffix} + +$python ../configure-ng.py --verbose \ + --confirm-license \ + --qsci-api \ + --debug \ + --sip=%{_bindir}/sip-%{$python_bin_suffix} make %{?_smp_mflags} +popd + +} + + %install +mkdir -p %{buildroot}%{_sysconfdir}/alternatives + +%{python_expand pushd build_%{$python_bin_suffix} + %make_install INSTALL_ROOT=%{buildroot} -sed -i 's/The "doc" directory/The "doc" directory of package %{name}-devel/' README -DOCDIR=%{buildroot}%{_docdir}/%{name}-devel -mkdir -p $DOCDIR -cp -pr NEWS THANKS contrib doc examples $DOCDIR - # create hardlinks for duplicate files -%fdupes -s $DOCDIR -%files +# Point to the correct location for the documentation files +cp ../README ./ +sed -i 's/The "doc" directory/The "doc" directory of package %{$python_prefix}-qt4-devel/' README + +popd + +# Prepare for update-alternatives usage +for p in pyuic4 pylupdate4 pyrcc4 ; do + mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{$python_bin_suffix} +done + +mv %{buildroot}%{_libdir}/qt4/plugins/designer/libpyqt4.so %{buildroot}%{_libdir}/qt4/plugins/designer/libpy%{$python_bin_suffix}qt4.so +mv -T %{buildroot}%{_datadir}/qt4/qsci/api/python %{buildroot}%{_datadir}/qt4/qsci/api/python_%{$python_bin_suffix} + +} + + +for p in pyuic4 pylupdate4 pyrcc4 ; do + %prepare_alternative $p +done + + +%post +%{python_install_alternative pyuic4} \ + --slave %{_bindir}/pylupdate4 pylupdate4 %{_bindir}/pylupdate4-%{python_bin_suffix} \ + --slave %{_bindir}/pyrcc4 pyrcc4 %{_bindir}/pyrcc4-%{python_bin_suffix} + +%postun +%python_uninstall_alternative pyuic4 + + +%files %{python_files} %defattr(-,root,root) -%doc README +%doc build_%{python_bin_suffix}/README +%doc ChangeLog LICENSE NEWS THANKS +%doc doc/ examples/ %{python_sitearch}/PyQt4/ %{python_sitelib}/dbus/mainloop/qt.so -%files devel + +%files %{python_files devel} %defattr(-,root,root) -%{_bindir}/pyuic4 -%{_datadir}/qt4/qsci/ -%{_docdir}/python-qt4-devel -%{_libdir}/qt4/plugins/designer/libpyqt4.so +%python_alternative %{_bindir}/pyuic4 +%python_alternative %{_bindir}/pylupdate4 +%python_alternative %{_bindir}/pyrcc4 +%{_libdir}/qt4/plugins/designer/libpy%{python_bin_suffix}qt4.so +%dir %{_datadir}/qt4/qsci/ +%dir %{_datadir}/qt4/qsci/api/ +%dir %{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/ +%{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/PyQt4.api -%files utils + +%files -n %{name}-utils %defattr(-,root,root) -%{_bindir}/pylupdate4 -%{_bindir}/pyrcc4 -%{_datadir}/sip/PyQt4 +%{_datadir}/sip/PyQt4/ + %changelog ++++++ python-qt4-rpmlintrc ++++++ addFilter("doc-file-dependency .*")
