Hello community,
here is the log from the commit of package eric5 for openSUSE:Factory checked
in at 2017-07-21 22:49:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eric5 (Old)
and /work/SRC/openSUSE:Factory/.eric5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eric5"
Fri Jul 21 22:49:49 2017 rev:36 rq:511460 version:5.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/eric5/eric5.changes 2015-01-06
09:06:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.eric5.new/eric5.changes 2017-07-21
22:49:54.572409346 +0200
@@ -1,0 +2,5 @@
+Wed Jul 19 04:41:57 UTC 2017 - bwiedem...@suse.com
+
+- Add reproducible.patch to sort file lists to fix build-compare (boo#1041090)
+
+-------------------------------------------------------------------
New:
----
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eric5.spec ++++++
--- /var/tmp/diff_new_pack.K2HlwN/_old 2017-07-21 22:49:55.576267739 +0200
+++ /var/tmp/diff_new_pack.K2HlwN/_new 2017-07-21 22:49:55.580267175 +0200
@@ -34,6 +34,8 @@
Source17: %{name}-i18n-tr-%{version}.tar.gz
Source18: %{name}-i18n-zh_CN.GB2312-%{version}.tar.gz
Patch0: %{name}-sidebar.patch
+# PATCH-FIX-UPSTREAM changeset: 5810:12d917813110
+Patch1: reproducible.patch
BuildRequires: fdupes
BuildRequires: python3-qscintilla
BuildRequires: python3-qt4
@@ -76,6 +78,7 @@
%prep
%setup -q -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -n
%{name}-%{version}
%patch0
+%patch1 -p1
# Fix non-executable scripts:
sed -i "s|#!/usr/bin/env python3||"
eric/{eric5_sqlbrowser,eric5_uipreviewer,Examples/rhallo,eric5_plugininstall,eric5_tray,eric5_pluginrepository,eric5_unittest,eric5_api,eric5,compileUiFiles,eric5_editor,eric5_trpreviewer,eric5_diff,install-i18n,uninstall,eric5_re,install,eric5_webbrowser,eric5_configure,eric5_iconeditor,Examples/hallo,eric5_qregexp,eric5_pluginuninstall,Utilities/crypto/py3AES,eric5_compare,eric5_doc,cleanupSource,eric5_snap,eric5_qregularexpression,Plugins/CheckerPlugins/CodeStyleChecker/pep8,ThirdParty/CharDet/chardet/chardetect}.py
++++++ reproducible.patch ++++++
PATCH-FIX-UPSTREAM
changeset: 5810:12d917813110
parent: 5806:2405d595c9cf
user: Detlev Offenbach <det...@die-offenbachs.de>
date: Tue Jul 18 19:14:20 2017 +0200
summary: Little change to the install script to support the reproducible
builds effort.
Index: eric5-5.5.2/install.py
===================================================================
--- eric5-5.5.2.orig/install.py
+++ eric5-5.5.2/install.py
@@ -928,13 +928,13 @@ def createConfig():
apis = []
if installApis:
for progLanguage in progLanguages:
- for apiName in glob.glob(
- os.path.join(sourceDir, "APIs", progLanguage, "*.api")):
+ for apiName in sorted(glob.glob(
+ os.path.join(sourceDir, "APIs", progLanguage, "*.api"))):
apis.append(os.path.basename(apiName))
if progLanguage == "Python":
# treat Python3 API files the same as Python API files
- for apiName in glob.glob(
- os.path.join(sourceDir, "APIs", "Python3", "*.api")):
+ for apiName in sorted(glob.glob(
+ os.path.join(sourceDir, "APIs", "Python3", "*.api"))):
apis.append(os.path.basename(apiName))
fn = 'eric5config.py'
