Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Thu Jul 9 10:50:51 CEST 2009. -------- --- python-qt4/python-qt4.changes 2009-06-17 11:40:25.000000000 +0200 +++ python-qt4/python-qt4.changes 2009-07-05 20:50:40.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jul 5 20:49:30 CEST 2009 - dmueller@novell.com + +- only use the configuration fix from trunk + +------------------------------------------------------------------- +Wed Jul 1 09:09:35 CEST 2009 - beineri@opensuse.org + +- add trunk diff to fix build with Qt 4.5.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- trunk-4.5.2-snapshot-20090627.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.OcS3ar/_old 2009-07-09 10:50:28.000000000 +0200 +++ /var/tmp/diff_new_pack.OcS3ar/_new 2009-07-09 10:50:28.000000000 +0200 @@ -32,12 +32,13 @@ Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 Version: 4.5.1 -Release: 1 +Release: 2 %define rversion %version Url: http://www.riverbankcomputing.co.uk/pyqt/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: PyQt-x11-gpl-%{rversion}.tar.bz2 Patch0: link-python.diff +Patch1: trunk-4.5.2-snapshot-20090627.diff Patch2: disable-rpaths.diff %py_requires Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) @@ -59,6 +60,7 @@ %prep %setup -q -n PyQt-x11-gpl-%{rversion} %patch0 -p1 +%patch1 -p1 %patch2 %build @@ -87,68 +89,3 @@ /usr/share/sip/PyQt4 %changelog -* Wed Jun 17 2009 dmueller@suse.de -- update to 4.5.1: - - Added the setCoordinateMode() and coordinateMode() methods to QGradient. -* Mon Jun 08 2009 beineri@opensuse.org -- update to 4.5 release: - * support for Python v3 and Qt v4.5.1 - * new Pythonic API for connecting signals and slots - * port of the current Qt examples launcher -* Wed Jun 03 2009 dmueller@suse.de -- update to 4.5 snapshot 20090601 to fix support with - newer python-sip -* Sun May 17 2009 beineri@opensuse.org -- update to 4.5 snapshot as of 20090507 -* Thu May 14 2009 dmueller@suse.de -- require at least the exact qt version it was built against -* Fri Mar 06 2009 coolo@suse.de -- link the modules against python libraries -* Fri Dec 05 2008 dmueller@suse.de -- update to 4.4.4: - - QVariant.toPyObject() will now handle any Python object. The way in which - QVariant wraps objects has subtlely changed in that the name returned by - typeName() may now be different, but is now more consistent. - - Added the data() method to the QPolygon, QPolygonF and QXmlAttributes - classes. - - Added the --no-designer-plugin option to configure.py to disable the - building of the Python plugin for Qt Designer. - - Added the missing Windows and Mac versions to QSysInfo. -* Sun Aug 10 2008 dmueller@suse.de -- update to 4.4.3: - * a QChar can now be used whenever a QString is expected - * all read related methods that take a maximum read length - will now raise an exception if the length is negative - * QVariant constructor that took a QVariantList argument - has been replaced - * QVariant constructor that took a QVariantMap argument - has been replaced - * added the embeddeddialogs.py and padnavigator.py examples - from Igor Prischepoff -* Mon Jun 30 2008 dmueller@suse.de -- Factory merge (bnc#402524) -* Sat Jun 21 2008 mstopka@opensuse.org -- libQtWebKit support added -* Tue May 27 2008 dmueller@suse.de -- update to 4.4.2: - * Major bugfixes, working bindings for Qt 4.4.0 -* Wed Mar 19 2008 dmueller@suse.de -- fix wrong requires for 10.2 -* Tue Feb 19 2008 dmueller@suse.de -- fix build against older distributions -* Thu Dec 13 2007 dmueller@suse.de -- bindings updated to Qt 4.3.3 -* Sat Aug 11 2007 dmueller@suse.de -- fix requires (#297650) -* Fri Aug 03 2007 dmueller@suse.de -- update to 4.3: - * bindings updated to match Qt 4.3.0 -* Sun Apr 15 2007 dmueller@suse.de -- fix build against newer Qt -* Thu Apr 12 2007 dmueller@suse.de -- Update to 4.2: - * bindings updated to match Qt 4.2.0 -* Thu Apr 05 2007 dmueller@suse.de -- build against Qt 4.3 -* Fri Jan 26 2007 dmueller@suse.de -- Initial package (4.1.1) ++++++ trunk-4.5.2-snapshot-20090627.diff ++++++ --- PyQt-x11-gpl-4.5.1/configure.py 2009-06-16 10:37:38.000000000 +0200 +++ PyQt-x11-gpl-4.5.2-snapshot-20090627/configure.py 2009-06-28 04:41:09.000000000 +0200 @@ -43,13 +43,14 @@ # Initialise the globals. -pyqt_version = 0x040501 -pyqt_version_str = "4.5.1" +pyqt_version = 0x040501 +pyqt_version_str = "4.5.1" sip_min_version = 0x040801 qt_version = 0 qt_edition = "" +qt_licensee = None qt_dir = None qt_incdir = None qt_libdir = None @@ -909,6 +910,9 @@ sipconfig.inform("Qt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr)) + if qt_licensee: + sipconfig.inform("Qt is licensed to %s." % qt_licensee) + if sys.platform == "darwin" and qt_framework: sipconfig.inform("Qt is built as a framework.") @@ -1465,9 +1469,8 @@ sipconfig.inform("This is the %s version of PyQt %s (licensed under the %s) for Python %s on %s." % (ltype, pyqt_version_str, lname, sys.version.split()[0], sys.platform)) # Common checks. - if qt_edition and ltype != "internal": - if qt_edition != "free" and ltype == "GPL": - sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition) + if qt_licensee and ltype == "GPL": + sipconfig.error("This version of PyQt and the commercial version of Qt have incompatible licenses.") # Confirm the license if not already done. if not opts.license_confirmed: @@ -1675,6 +1678,8 @@ out << QT_VERSION << '\\n'; out << QT_EDITION << '\\n'; + out << QLibraryInfo::licensee() << '\\n'; + #if defined(QT_SHARED) || defined(QT_DLL) out << "shared\\n"; #else @@ -1761,7 +1766,7 @@ f.close() global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_pluginsdir - global qt_version, qt_edition, qt_shared, qt_xfeatures + global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures qt_dir = lines[0] qt_incdir = lines[1] @@ -1771,8 +1776,12 @@ qt_pluginsdir = lines[5] qt_version = lines[6] qt_edition = lines[7] - qt_shared = lines[8] - qt_xfeatures = lines[9:] + qt_licensee = lines[8] + qt_shared = lines[9] + qt_xfeatures = lines[10:] + + if qt_licensee == 'Open Source': + qt_licensee = None try: qt_version = int(qt_version) @@ -1789,6 +1798,10 @@ if qt_edition & 0x200: # It has ActiveQt. qt_edition = "Desktop" + + # ActiveQt became part of the open source version in v4.5.2. + if qt_version >= 0x040502 and qt_licensee is None: + qt_edition = "free" elif qt_edition & 0x008: # It has OpenGL. qt_edition = "free" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org