Hello community, here is the log from the commit of package python-qt5 for openSUSE:Factory checked in at 2015-02-05 11:00:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old) and /work/SRC/openSUSE:Factory/.python-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2015-01-05 04:43:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes 2015-02-05 11:00:12.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Jan 16 20:32:07 UTC 2015 - [email protected] + +- Enable QtWebEngineWidgets and QtWebChannel integration +- Update build-compare.diff +- Drop fdupes usage due to unpredictable symlinking +- Add rpmlintrc due to duplicates waste warnings: we rather have + a few bytes more than to republish same binaries due to fdupes + +------------------------------------------------------------------- python3-qt5.changes: same change New: ---- python-qt5-rpmlintrc python3-qt5-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt5.spec ++++++ --- /var/tmp/diff_new_pack.63upHY/_old 2015-02-05 11:00:13.000000000 +0100 +++ /var/tmp/diff_new_pack.63upHY/_new 2015-02-05 11:00:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Development/Libraries/Python Url: http://www.riverbankcomputing.com/software/pyqt/intro Source: http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz +Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE: Easier comparison of different builds Patch1: build-compare.diff # PATCH-FIX-OPENSUSE: DIsable RPATH @@ -31,7 +32,6 @@ # PATCH-FIX-UPSTREAM: fix_qreal_check.diff -- check if qreal is double based on sizeof Patch3: fix_qreal_check.diff BuildRequires: dbus-1-python-devel -BuildRequires: fdupes BuildRequires: gdb BuildRequires: libQt5WebKit5-devel BuildRequires: libQt5WebKitWidgets-devel @@ -42,6 +42,10 @@ BuildRequires: libqt5-qtserialport-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qttools-devel +BuildRequires: libqt5-qtwebchannel-devel +%if 0%{?suse_version} >= 1320 +BuildRequires: libqt5-qtwebengine-devel +%endif BuildRequires: libqt5-qtwebsockets-devel BuildRequires: libqt5-qtx11extras-devel BuildRequires: libqt5-qtxmlpatterns-devel @@ -99,7 +103,7 @@ %setup -q -n PyQt-gpl-%{version} #PATCH-FIX-OPENSUSE: ease comparison of build by removing a ctime() call in # the files compiled by pyuic5 -%patch1 +%patch1 -p1 #PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5. #patch2 #patch3 -p1 @@ -142,11 +146,6 @@ pushd $DOCDIR chmod -x `find . -name '*.py*'` popd - # create hardlinks for duplicate files -%fdupes -s $DOCDIR - -%clean -rm -rf %{buildroot} %post devel ++++++ python3-qt5.spec ++++++ --- /var/tmp/diff_new_pack.63upHY/_old 2015-02-05 11:00:13.000000000 +0100 +++ /var/tmp/diff_new_pack.63upHY/_new 2015-02-05 11:00:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Development/Libraries/Python Url: http://www.riverbankcomputing.com/software/pyqt/intro Source: http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz +Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE: Easier comparison of different builds Patch1: build-compare.diff # PATCH-FIX-OPENSUSE: DIsable RPATH @@ -32,7 +33,6 @@ Patch3: fix_qreal_check.diff BuildRequires: dbus-1-python-devel BuildRequires: dbus-1-python3-devel -BuildRequires: fdupes BuildRequires: libQt5WebKit5-devel BuildRequires: libQt5WebKitWidgets-devel BuildRequires: libqt5-qtbase-devel @@ -42,6 +42,10 @@ BuildRequires: libqt5-qtserialport-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qttools-devel +BuildRequires: libqt5-qtwebchannel-devel +%if 0%{?suse_version} >= 1320 +BuildRequires: libqt5-qtwebengine-devel +%endif BuildRequires: libqt5-qtwebsockets-devel BuildRequires: libqt5-qtx11extras-devel BuildRequires: libqt5-qtxmlpatterns-devel @@ -88,7 +92,7 @@ %setup -q -n PyQt-gpl-%{version} #PATCH-FIX-OPENSUSE: ease comparison of build by removing a ctime() call in # the files compiled by pyuic5 -%patch1 +%patch1 -p1 #PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5. #patch2 #patch3 -p1 @@ -137,11 +141,6 @@ pushd $DOCDIR chmod -x `find . -name '*.py*'` popd - # create hardlinks for duplicate files -%fdupes -s $DOCDIR - -%clean -rm -rf %{buildroot} %post devel ++++++ build-compare.diff ++++++ --- /var/tmp/diff_new_pack.63upHY/_old 2015-02-05 11:00:13.000000000 +0100 +++ /var/tmp/diff_new_pack.63upHY/_new 2015-02-05 11:00:13.000000000 +0100 @@ -1,6 +1,36 @@ ---- pyuic/uic/__init__.py.orig 2013-08-05 20:02:06.469095336 +0200 -+++ pyuic/uic/__init__.py 2013-08-05 20:03:14.547609380 +0200 -@@ -47,8 +47,7 @@ +Description: prevent embedding of timestamps in files generated by rcc and uic + Timestamps in generated files will make packages using those tools no longer + build reproducibly, because the files will differ in each build. + As those timestamps are no useful information, they can be left out. +Author: Reiner Herrmann <[email protected]> + +Index: PyQt-gpl-5.4/pyrcc/rcc.cpp +=================================================================== +--- PyQt-gpl-5.4.orig/pyrcc/rcc.cpp ++++ PyQt-gpl-5.4/pyrcc/rcc.cpp +@@ -45,7 +45,6 @@ + #include <qfile.h> + #include <qfileinfo.h> + #include <qlocale.h> +-#include <qdatetime.h> + #include <qtextstream.h> + #include <qbytearray.h> + #include <qhash.h> +@@ -421,8 +420,7 @@ RCCResourceLibrary::writeHeader(FILE *ou + fprintf(out, "# -*- coding: utf-8 -*-\n\n"); + fprintf(out, "# Resource object code\n"); + fprintf(out, "#\n"); +- fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toUtf8().constData()); +- fprintf(out, "# by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); ++ fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); + fprintf(out, "#\n"); + fprintf(out, "# WARNING! All changes made in this file will be lost!\n"); + fprintf(out, "\n"); +Index: PyQt-gpl-5.4/pyuic/uic/__init__.py +=================================================================== +--- PyQt-gpl-5.4.orig/pyuic/uic/__init__.py ++++ PyQt-gpl-5.4/pyuic/uic/__init__.py +@@ -47,8 +47,7 @@ _header = """# -*- coding: utf-8 -*- # Form implementation generated from reading ui file '%s' # @@ -10,7 +40,15 @@ # # WARNING! All changes made in this file will be lost! -@@ -159,7 +158,7 @@ +@@ -149,7 +148,6 @@ def compileUi(uifile, pyfile, execute=Fa + module is foo_rc. + """ + +- from time import ctime + from PyQt5.QtCore import PYQT_VERSION_STR + + try: +@@ -159,7 +157,7 @@ def compileUi(uifile, pyfile, execute=Fa indenter.indentwidth = indent ++++++ python-qt5-rpmlintrc ++++++ addFilter("files-duplicated-waste .*") addFilter("files-duplicate .*")++++++ python3-qt5-rpmlintrc ++++++ addFilter("files-duplicated-waste .*") addFilter("files-duplicate .*")-- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
