Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at 2011-11-28 12:56:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt4 (Old) and /work/SRC/openSUSE:Factory/.python-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt4/python-qt4.changes 2011-10-21 16:35:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python-qt4.changes 2011-11-28 12:56:41.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 25 11:00:27 UTC 2011 - [email protected] + +- Use %make_install + +------------------------------------------------------------------- +Mon Nov 21 17:52:12 UTC 2011 - [email protected] + +- Update to 4.8.6, see http://riverbankcomputing.com/static/Downloads/PyQt4/ChangeLog +- Spec cleanup + + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-qt4/python3-qt4.changes 2011-10-21 16:35:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python3-qt4.changes 2011-11-28 12:56:41.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 25 11:00:31 UTC 2011 - [email protected] + +- Use %make_install + +------------------------------------------------------------------- +Mon Nov 21 17:52:18 UTC 2011 - [email protected] + +- Update to 4.8.6, see http://riverbankcomputing.com/static/Downloads/PyQt4/ChangeLog +- Define python3_sitearch for Opensuse < 12.1 +- Spec cleanup + + +------------------------------------------------------------------- Old: ---- PyQt-x11-gpl-4.8.5.tar.bz2 New: ---- PyQt-x11-gpl-4.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.WNyPdY/_old 2011-11-28 12:56:43.000000000 +0100 +++ /var/tmp/diff_new_pack.WNyPdY/_new 2011-11-28 12:56:43.000000000 +0100 @@ -15,36 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: python-qt4 -BuildRequires: libqt4-devel python-devel python-sip-devel -BuildRequires: libQtWebKit-devel -BuildRequires: fdupes BuildRequires: dbus-1-python-devel +BuildRequires: fdupes +BuildRequires: libQtWebKit-devel +BuildRequires: libqt4-devel +BuildRequires: python-devel +BuildRequires: python-sip-devel Requires: dbus-1-python >= %( echo `rpm -q --queryformat '%{VERSION}' dbus-1-python`) %if 0%{?suse_version} >= 1130 BuildRequires: phonon-devel %endif -%if %sles_version == 10 +%if 0%{?sles_version} == 10 Requires: python-elementtree %endif -Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}' python-sip`) +Version: 4.8.6 +Release: 1 License: GPLv2, GPLv3 or Riverbank Commercial License -Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.8.5 -Release: 1 -%define rversion %version +%define rversion %{version} Url: http://www.riverbankcomputing.com/software/pyqt/intro -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: Development/Libraries/Python Source0: PyQt-x11-gpl-%{rversion}.tar.bz2 Patch0: link-python.diff Patch2: disable-rpaths.diff Patch3: build-compare.diff +Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}' python-sip`) %py_requires -%if %suse_version <= 1110 +%if 0%{?suse_version} <= 1110 %define python_sitelib %{py_sitedir} %endif Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) @@ -57,17 +57,14 @@ implemented as a set of Python modules and contain over 300 classes and nearly 6,000 functions and methods. -Authors: --------- - Riverbank Computing Limited - - %package devel License: GPLv2, GPLv3 or Riverbank Commercial License -Group: Development/Libraries/Python Summary: PyQt - devel part of python bindings for Qt 4 -Requires: libqt4-devel python-sip-devel python-qt4-utils -Requires: %name = %version +Group: Development/Libraries/Python +Requires: %{name} = %{version} +Requires: libqt4-devel +Requires: python-qt4-utils +Requires: python-sip-devel %description devel PyQt is a set of Python bindings for Trolltech's Qt application @@ -80,14 +77,9 @@ This package contains all the developer tools you need to create your own PyQt applications. -Authors: --------- - Riverbank Computing Limited - - %package utils -Summary: Common files for PyQt4 for python2 and python3 License: GPLv2, GPLv3 or Riverbank Commercial License +Summary: Common files for PyQt4 for python2 and python3 Group: Development/Libraries/Python %description utils @@ -95,7 +87,6 @@ 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 PyQt-x11-gpl-%{rversion} %patch0 -p1 @@ -103,53 +94,53 @@ %patch3 %build -export CXXFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" python configure.py --confirm-license --qsci-api -u -make %{_smp_mflags} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=$RPM_BUILD_ROOT install +%make_install INSTALL_ROOT=%{buildroot} sed -i 's/The "doc" directory/The "doc" directory of package %{name}-devel/' README -DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/packages/%{name}-devel +DOCDIR=%{buildroot}%{_datadir}/doc/packages/%{name}-devel mkdir -p $DOCDIR cp -pr NEWS THANKS contrib doc examples $DOCDIR # create hardlinks for duplicate files %fdupes -s $DOCDIR %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) %doc README %dir %{py_sitedir}/PyQt4 -%{py_sitedir}/PyQt4/__init__.* %{py_sitedir}/PyQt4/*.so +%{py_sitedir}/PyQt4/__init__.* %{py_sitedir}/PyQt4/uic %{python_sitelib}/dbus/mainloop/qt.so -%if %sles_version == 10 -%{py_sitedir}/PyQt4/elementtree/__init__.py -%{py_sitedir}/PyQt4/elementtree/ElementTree.py +%if 0%{?sles_version} == 10 %{py_sitedir}/PyQt4/elementtree/ElementPath.py +%{py_sitedir}/PyQt4/elementtree/ElementTree.py +%{py_sitedir}/PyQt4/elementtree/__init__.py %endif %files devel %defattr(-,root,root) -/usr/share/doc/packages/python-qt4-devel -/usr/bin/pyuic4 +%dir %{_datadir}/qt4/qsci +%dir %{_datadir}/qt4/qsci/api +%dir %{_datadir}/qt4/qsci/api/python +%{_bindir}/pyuic4 +%{_datadir}/doc/packages/python-qt4-devel +%{_datadir}/qt4/qsci/api/python/PyQt4.api +%{_libdir}/qt4/plugins/designer/libpythonplugin.so %{py_sitedir}/PyQt4/pyqtconfig.py -%dir /usr/share/qt4/qsci -%dir /usr/share/qt4/qsci/api -%dir /usr/share/qt4/qsci/api/python -/usr/share/qt4/qsci/api/python/PyQt4.api -/usr/%{_lib}/qt4/plugins/designer/libpythonplugin.so %files utils %defattr(-,root,root) -/usr/bin/pylupdate4 -/usr/bin/pyrcc4 -/usr/share/sip/PyQt4 +%{_bindir}/pylupdate4 +%{_bindir}/pyrcc4 +%{_datadir}/sip/PyQt4 %changelog ++++++ python3-qt4.spec ++++++ --- /var/tmp/diff_new_pack.WNyPdY/_old 2011-11-28 12:56:43.000000000 +0100 +++ /var/tmp/diff_new_pack.WNyPdY/_new 2011-11-28 12:56:43.000000000 +0100 @@ -15,29 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: python3-qt4 +Version: 4.8.6 +Release: 1 License: GPLv2, GPLv3 or Riverbank Commercial License -Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.8.5 -Release: 1 -%define rversion %version +%define rversion %{version} Url: http://www.riverbankcomputing.com/software/pyqt/intro -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: Development/Libraries/Python Source0: PyQt-x11-gpl-%{rversion}.tar.bz2 Patch0: link-python3.diff Patch2: disable-rpaths.diff Patch3: build-compare.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1140 BuildRequires: python3-base %endif -BuildRequires: libqt4-devel python3-sip-devel -BuildRequires: libQtWebKit-devel BuildRequires: fdupes +BuildRequires: libQtWebKit-devel +BuildRequires: libqt4-devel +BuildRequires: python3-sip-devel %if 0%{?suse_version} >= 1130 BuildRequires: phonon-devel %endif @@ -46,8 +46,10 @@ %if 0%{?suse_version} > 1140 Requires: python3-base %endif -Requires: python3-sip Requires: libqt4-x11 +Requires: python3-sip + +%global python3_sitearch %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True))" 2>/dev/null || echo PYTHON-NOT-FOUND) %description PyQt is a set of Python bindings for Trolltech's Qt application @@ -57,18 +59,14 @@ implemented as a set of Python modules and contain over 300 classes and nearly 6,000 functions and methods. - - -Authors: --------- - Riverbank Computing Limited - %package devel License: GPLv2, GPLv3 or Riverbank Commercial License -Group: Development/Libraries/Python Summary: PyQt - devel part of python bindings for Qt 4 -Requires: libqt4-devel python3-sip-devel python-qt4-utils -Requires: %name = %version +Group: Development/Libraries/Python +Requires: %{name} = %{version} +Requires: libqt4-devel +Requires: python-qt4-utils +Requires: python3-sip-devel %description devel PyQt is a set of Python bindings for Trolltech's Qt application @@ -81,12 +79,6 @@ This package contains all the developer tools you need to create your own PyQt applications. - -Authors: --------- - Riverbank Computing Limited - - %prep %setup -q -n PyQt-x11-gpl-%{rversion} %patch0 -p1 @@ -94,48 +86,47 @@ %patch3 %build -export CXXFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" python3 configure.py --confirm-license --qsci-api -u -make %{_smp_mflags} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=$RPM_BUILD_ROOT install +%make_install INSTALL_ROOT=%{buildroot} # pylupdate4 and pyrcc4 are in python-qt4-utils -rm $RPM_BUILD_ROOT/usr/bin/pylupdate4 $RPM_BUILD_ROOT/usr/bin/pyrcc4 -rm -rf $RPM_BUILD_ROOT/usr/share/sip/PyQt4 -mv $RPM_BUILD_ROOT/usr/bin/pyuic4 $RPM_BUILD_ROOT/usr/bin/py3uic4 -mv $RPM_BUILD_ROOT/usr/share/qt4/qsci/api/python $RPM_BUILD_ROOT/usr/share/qt4/qsci/api/python3 -mv $RPM_BUILD_ROOT/usr/%{_lib}/qt4/plugins/designer/libpythonplugin.so $RPM_BUILD_ROOT/usr/%{_lib}/qt4/plugins/designer/libpython3plugin.so +rm %{buildroot}%{_bindir}/pylupdate4 %{buildroot}%{_bindir}/pyrcc4 +rm -rf %{buildroot}%{_datadir}/sip/PyQt4 +mv %{buildroot}%{_bindir}/pyuic4 %{buildroot}%{_bindir}/py3uic4 +mv %{buildroot}%{_datadir}/qt4/qsci/api/python %{buildroot}%{_datadir}/qt4/qsci/api/python3 +mv %{buildroot}%{_libdir}/qt4/plugins/designer/libpythonplugin.so %{buildroot}%{_libdir}/qt4/plugins/designer/libpython3plugin.so sed -i 's/The "doc" directory/The "doc" directory of package %{name}-devel/' README -DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/packages/%{name}-devel +DOCDIR=%{buildroot}%{_datadir}/doc/packages/%{name}-devel mkdir -p $DOCDIR cp -pr NEWS THANKS contrib doc examples $DOCDIR # create hardlinks for duplicate files %fdupes -s $DOCDIR %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) %doc README %dir %{python3_sitearch}/PyQt4 -%{python3_sitearch}/PyQt4/__init__.* %{python3_sitearch}/PyQt4/*.so +%{python3_sitearch}/PyQt4/__init__.* %{python3_sitearch}/PyQt4/uic -#{python3_sitearch}/dbus/mainloop/qt.so %files devel %defattr(-,root,root) -/usr/share/doc/packages/python3-qt4-devel -/usr/bin/py3uic4 +%dir %{_datadir}/qt4/qsci +%dir %{_datadir}/qt4/qsci/api +%dir %{_datadir}/qt4/qsci/api/python3 +%{_bindir}/py3uic4 +%{_datadir}/doc/packages/python3-qt4-devel +%{_datadir}/qt4/qsci/api/python3/PyQt4.api +%{_libdir}/qt4/plugins/designer/libpython3plugin.so %{python3_sitearch}/PyQt4/pyqtconfig.py -%dir /usr/share/qt4/qsci -%dir /usr/share/qt4/qsci/api -%dir /usr/share/qt4/qsci/api/python3 -/usr/share/qt4/qsci/api/python3/PyQt4.api -/usr/%{_lib}/qt4/plugins/designer/libpython3plugin.so %changelog ++++++ PyQt-x11-gpl-4.8.5.tar.bz2 -> PyQt-x11-gpl-4.8.6.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python-qt4/PyQt-x11-gpl-4.8.5.tar.bz2 /work/SRC/openSUSE:Factory/.python-qt4.new/PyQt-x11-gpl-4.8.6.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
