Hello community,
here is the log from the commit of package python-qt5 for openSUSE:Factory
checked in at 2017-06-01 16:24:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5"
Thu Jun 1 16:24:19 2017 rev:21 rq:498717 version:5.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2017-04-28
10:46:47.702145400 +0200
+++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes
2017-06-01 16:24:31.412590055 +0200
@@ -1,0 +2,10 @@
+Mon May 22 20:23:46 UTC 2017 - bwiedem...@suse.com
+
+- Add reproducible.patch to sort input files to make build fully reproducible
+
+-------------------------------------------------------------------
+Tue May 16 17:57:51 UTC 2017 - toddrme2...@gmail.com
+
+- Fix issues with requires.
+
+-------------------------------------------------------------------
New:
----
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt5.spec ++++++
--- /var/tmp/diff_new_pack.V5UKay/_old 2017-06-01 16:24:32.004506590 +0200
+++ /var/tmp/diff_new_pack.V5UKay/_new 2017-06-01 16:24:32.004506590 +0200
@@ -28,6 +28,8 @@
Source99: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE: Disable RPATH
Patch1: disable-rpaths.diff
+# PATCH-FIX-UPSTREAM -- TODO
+Patch2: reproducible.patch
BuildRequires: dbus-1-devel
BuildRequires: gdb
BuildRequires: libqt5-qtbase-devel
@@ -65,15 +67,15 @@
BuildRequires: pkg-config
BuildRequires: python-rpm-macros
Requires: %{name}-utils
+Requires: python-sip(api) = %python_sip_api_ver
+%requires_ge python-dbus-python
+%requires_ge libqt5-x11
%ifpython2
%requires_ge dbus-1-python
-%{requires_python2_sip_api}
%endif
%ifpython3
%requires_ge dbus-1-python3
-%{requires_python3_sip_api}
%endif
-%requires_ge libqt5-x11
%python_subpackages
@@ -158,6 +160,7 @@
%setup -q -n PyQt5_gpl-%{version}
#PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5.
%patch1
+%patch2 -p1
%build
export CXXFLAGS="%{optflags}"
++++++ reproducible.patch ++++++
diff -ru PyQt5_gpl-5.8.2.orig/configure.py PyQt5_gpl-5.8.2/configure.py
--- PyQt5_gpl-5.8.2.orig/configure.py 2017-03-30 08:46:57.000000000 +0000
+++ PyQt5_gpl-5.8.2/configure.py 2017-05-22 17:38:59.779847576 +0000
@@ -1545,11 +1545,11 @@
sp_qpy_dir = source_path('qpy', mname)
qpy_c_sources = [os.path.relpath(f, mname)
- for f in glob.glob(os.path.join(sp_qpy_dir, '*.c'))]
+ for f in sorted(glob.glob(os.path.join(sp_qpy_dir,
'*.c')))]
qpy_cpp_sources = [os.path.relpath(f, mname)
- for f in glob.glob(os.path.join(sp_qpy_dir, '*.cpp'))]
+ for f in sorted(glob.glob(os.path.join(sp_qpy_dir,
'*.cpp')))]
qpy_headers = [os.path.relpath(f, mname)
- for f in glob.glob(os.path.join(sp_qpy_dir, '*.h'))]
+ for f in sorted(glob.glob(os.path.join(sp_qpy_dir,
'*.h')))]
qpy_sources = qpy_c_sources + qpy_cpp_sources
else:
@@ -1780,7 +1780,7 @@
pro_lines = []
- headers = [os.path.basename(f) for f in glob.glob('%s/*.h' % src_dir)]
+ headers = [os.path.basename(f) for f in sorted(glob.glob('%s/*.h' %
src_dir))]
if other_headers is not None:
headers += other_headers
@@ -1788,9 +1788,9 @@
if len(headers) != 0:
pro_lines.append('HEADERS = %s' % ' '.join(headers))
- sources = [os.path.basename(f) for f in glob.glob('%s/*.c' % src_dir)]
+ sources = [os.path.basename(f) for f in sorted(glob.glob('%s/*.c' %
src_dir))]
- for f in glob.glob('%s/*.cpp' % src_dir):
+ for f in sorted(glob.glob('%s/*.cpp' % src_dir)):
f = os.path.basename(f)
# Exclude any moc generated C++ files that might be around from a
@@ -1805,7 +1805,7 @@
pro_lines.append('SOURCES = %s' % ' '.join(sources))
objective_sources = [
- os.path.basename(f) for f in glob.glob('%s/*.mm' % src_dir)]
+ os.path.basename(f) for f in sorted(glob.glob('%s/*.mm' %
src_dir))]
if len(objective_sources) != 0:
pro_lines.append('OBJECTIVE_SOURCES = %s' % '
'.join(objective_sources))
@@ -2580,7 +2580,7 @@
if target_config.pyqt_sip_dir:
sip_files = [os.path.relpath(f, mname)
- for f in glob.glob(source_path('sip', mname, '*.sip'))]
+ for f in sorted(glob.glob(source_path('sip', mname, '*.sip')))]
if len(sip_files) != 0:
pro_lines.append('sip.path = %s' %
qmake_quote(target_config.pyqt_sip_dir + '/' + mname))
pro_lines.append('sip.files = %s' % ' '.join(sip_files))
