Hello community,
here is the log from the commit of package python-qt4 for openSUSE:Factory
checked in at 2012-06-06 16:09:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt4 (Old)
and /work/SRC/openSUSE:Factory/.python-qt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt4", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt4/python-qt4.changes 2011-12-25
17:52:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt4.new/python-qt4.changes
2012-06-06 16:09:43.000000000 +0200
@@ -1,0 +2,19 @@
+Mon Jun 4 08:36:27 UTC 2012 - idon...@suse.com
+
+- Update license
+
+-------------------------------------------------------------------
+Mon May 28 03:34:49 UTC 2012 - m...@suse.com
+
+- Fix files list
+ * Added pyqtconfig.py back
+
+-------------------------------------------------------------------
+Fri May 25 08:47:18 UTC 2012 - toddrme2...@gmail.com
+
+- Update to version 4.9.1
+ * Bugfixes
+- Spec file cleanups
+- Fixed licenses
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python-qt4/python3-qt4.changes 2011-12-25
17:52:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt4.new/python3-qt4.changes
2012-06-06 16:09:43.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jun 4 08:36:33 UTC 2012 - idon...@suse.com
+
+- Update license
+
+-------------------------------------------------------------------
+Fri May 25 08:47:18 UTC 2012 - toddrme2...@gmail.com
+
+- Update to version 4.9.1
+ * Bugfixes
+- Spec file cleanups
+- Fixed licenses
+
+-------------------------------------------------------------------
Old:
----
PyQt-x11-gpl-4.9.tar.gz
New:
----
PyQt-x11-gpl-4.9.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt4.spec ++++++
--- /var/tmp/diff_new_pack.bRUpnL/_old 2012-06-06 16:09:45.000000000 +0200
+++ /var/tmp/diff_new_pack.bRUpnL/_new 2012-06-06 16:09:45.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-qt4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,10 @@
Name: python-qt4
-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 0%{?sles_version} == 10
-Requires: python-elementtree
-%endif
-Version: 4.9
+Version: 4.9.1
Release: 0
Summary: PyQt - python bindings for Qt 4
-License: GPLv2, GPLv3 or Riverbank Commercial License
+License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree
Group: Development/Libraries/Python
%define rversion %{version}
Url: http://www.riverbankcomputing.com/software/pyqt/intro
@@ -41,12 +28,24 @@
Patch0: link-python.diff
Patch2: disable-rpaths.diff
Patch3: build-compare.diff
+BuildRequires: dbus-1-python-devel
+BuildRequires: fdupes
+BuildRequires: libQtWebKit-devel
+BuildRequires: libqt4-devel
+BuildRequires: phonon-devel
+BuildRequires: python-devel
+BuildRequires: python-sip-devel
+Requires: dbus-1-python >= %( echo `rpm -q --queryformat '%{VERSION}'
dbus-1-python`)
+Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-x11`)
Requires: python-sip >= %( echo `rpm -q --queryformat '%{VERSION}'
python-sip`)
+%if 0%{?sles_version} == 10
+Requires: python-elementtree
+%endif
%py_requires
%if 0%{?suse_version} <= 1110
-%define python_sitelib %{py_sitedir}
+%{!?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))")}
%endif
-Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-x11`)
%description
PyQt is a set of Python bindings for Trolltech's Qt application
@@ -100,7 +99,7 @@
%install
%make_install INSTALL_ROOT=%{buildroot}
sed -i 's/The "doc" directory/The "doc" directory of package %{name}-devel/'
README
-DOCDIR=%{buildroot}%{_datadir}/doc/packages/%{name}-devel
+DOCDIR=%{buildroot}%{_docdir}/%{name}-devel
mkdir -p $DOCDIR
cp -pr NEWS THANKS contrib doc examples $DOCDIR
# create hardlinks for duplicate files
@@ -112,27 +111,17 @@
%files
%defattr(-,root,root)
%doc README
-%dir %{py_sitedir}/PyQt4
-%{py_sitedir}/PyQt4/*.so
-%{py_sitedir}/PyQt4/__init__.*
-%{py_sitedir}/PyQt4/uic
+%{python_sitearch}/PyQt4/
+%exclude %{python_sitearch}/PyQt4/pyqtconfig.py
%{python_sitelib}/dbus/mainloop/qt.so
-%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)
-%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
+%{_datadir}/qt4/qsci/
+%{_docdir}/python-qt4-devel
%{_libdir}/qt4/plugins/designer/libpythonplugin.so
-%{py_sitedir}/PyQt4/pyqtconfig.py
+%{python_sitearch}/PyQt4/pyqtconfig.py
%files utils
%defattr(-,root,root)
++++++ python3-qt4.spec ++++++
--- /var/tmp/diff_new_pack.bRUpnL/_old 2012-06-06 16:09:45.000000000 +0200
+++ /var/tmp/diff_new_pack.bRUpnL/_new 2012-06-06 16:09:45.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-qt4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,10 @@
Name: python3-qt4
-Version: 4.9
+Version: 4.9.1
Release: 0
Summary: PyQt - python bindings for Qt 4
-License: GPLv2, GPLv3 or Riverbank Commercial License
+License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree
Group: Development/Libraries/Python
%define rversion %{version}
Url: http://www.riverbankcomputing.com/software/pyqt/intro
@@ -29,26 +29,20 @@
Patch2: disable-rpaths.diff
Patch3: build-compare.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version} > 1140
-BuildRequires: python3-base
-%endif
BuildRequires: fdupes
BuildRequires: libQtWebKit-devel
BuildRequires: libqt4-devel
-BuildRequires: python3-sip-devel
-%if 0%{?suse_version} >= 1130
BuildRequires: phonon-devel
-%endif
-
-Requires: python3
-%if 0%{?suse_version} > 1140
-Requires: python3-base
-%endif
+BuildRequires: python3-sip-devel
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)
+%if 0%{?suse_version} <= 1140
+%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?py3_ver: %global py3_ver %(python3 -c "import sys;
version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]);
print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}
+%else
+BuildRequires: python3-base
+%endif
+Requires: python(abi) = %{py3_ver}
%description
PyQt is a set of Python bindings for Trolltech's Qt application
@@ -99,7 +93,7 @@
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=%{buildroot}%{_datadir}/doc/packages/%{name}-devel
+DOCDIR=%{buildroot}%{_docdir}/%{name}-devel
mkdir -p $DOCDIR
cp -pr NEWS THANKS contrib doc examples $DOCDIR
# create hardlinks for duplicate files
@@ -111,19 +105,14 @@
%files
%defattr(-,root,root)
%doc README
-%dir %{python3_sitearch}/PyQt4
-%{python3_sitearch}/PyQt4/*.so
-%{python3_sitearch}/PyQt4/__init__.*
-%{python3_sitearch}/PyQt4/uic
+%{python3_sitearch}/PyQt4/
+%exclude %{python3_sitearch}/PyQt4/pyqtconfig.py
%files devel
%defattr(-,root,root)
-%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
+%{_datadir}/qt4/qsci/
+%{_docdir}/python3-qt4-devel
%{_libdir}/qt4/plugins/designer/libpython3plugin.so
%{python3_sitearch}/PyQt4/pyqtconfig.py
++++++ PyQt-x11-gpl-4.9.tar.gz -> PyQt-x11-gpl-4.9.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-qt4/PyQt-x11-gpl-4.9.tar.gz
/work/SRC/openSUSE:Factory/.python-qt4.new/PyQt-x11-gpl-4.9.1.tar.gz differ:
char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
