Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2018-10-01 08:18:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop" Mon Oct 1 08:18:07 2018 rev:48 rq:638854 version:0.9.601 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2018-09-24 13:14:06.925617773 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop.new/lollypop.changes 2018-10-01 08:18:13.137937116 +0200 @@ -1,0 +2,6 @@ +Thu Sep 27 19:38:58 UTC 2018 - [email protected] + +- Add lollypop-0.9.601-reproducible.patch: Make build reproducible + (boo#1110032). + +------------------------------------------------------------------- New: ---- lollypop-0.9.601-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.dUtwET/_old 2018-10-01 08:18:13.537936860 +0200 +++ /var/tmp/diff_new_pack.dUtwET/_new 2018-10-01 08:18:13.541936858 +0200 @@ -25,6 +25,8 @@ Group: Productivity/Multimedia/Sound/Players Url: https://wiki.gnome.org/Apps/Lollypop Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM lollypop-0.9.601-reproducible.patch -- boo#1110032 +Patch0: lollypop-0.9.601-reproducible.patch BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: itstool ++++++ lollypop-0.9.601-reproducible.patch ++++++ >From 4347f41b2abc3838f5356c22fe47b36aa25130a0 Mon Sep 17 00:00:00 2001 From: Antoine Belvire <[email protected]> Date: Thu, 27 Sep 2018 19:47:31 +0200 Subject: [PATCH] Make build noarch-reproducible Build output may differ depending on the architecture because of PYTHON_EXEC_DIR (/usr/lib/pythonX.X vs. /usr/lib64/pythonX.X). This makes lollypop impossible to package as "noarch" (not architecture-dependent). This commit removes PYTHON_EXEC_DIR definition and use, as we'd like to package lollypop as noarch and as this variable seems only needed for execution via JHBuild. --- lollypop-cli.in | 4 ---- lollypop.in | 4 ---- meson.build | 2 -- search-provider/lollypop-sp.in | 4 ---- 4 files changed, 14 deletions(-) diff --git a/lollypop-cli.in b/lollypop-cli.in index d3395a05..80274b23 100755 --- a/lollypop-cli.in +++ b/lollypop-cli.in @@ -12,10 +12,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import sys -# Make sure we'll find the pygobject module, even in JHBuild -sys.path.insert(1, '@PYTHON_EXEC_DIR@') -# Make sure we'll find the lollypop modules, even in JHBuild -sys.path.insert(1, '@PYTHON_DIR@') import gi gi.require_version('Secret', '1') gi.require_version('TotemPlParser', '1.0') diff --git a/lollypop.in b/lollypop.in index 17952524..507034d4 100755 --- a/lollypop.in +++ b/lollypop.in @@ -8,10 +8,6 @@ import gettext if 'LOLLYPOP_TRACE' in os.environ: from pycallgraph import PyCallGraph from pycallgraph.output import GraphvizOutput -# Make sure we'll find the pygobject module, even in JHBuild -sys.path.insert(1, '@PYTHON_EXEC_DIR@') -# Make sure we'll find the lollypop modules, even in JHBuild -sys.path.insert(1, '@PYTHON_DIR@') from gi.repository import Gio diff --git a/meson.build b/meson.build index 541d2331..447ae7c9 100644 --- a/meson.build +++ b/meson.build @@ -26,8 +26,6 @@ conf = configuration_data() conf.set('PACKAGE_URL', 'https://wiki.gnome.org/Apps/Lollypop') conf.set('DATA_DIR', DATA_DIR) conf.set('LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale')) -conf.set('PYTHON_DIR', python_dir) -conf.set('PYTHON_EXEC_DIR', join_paths(get_option('prefix'), python.sysconfig_path('stdlib'))) conf.set('libexecdir', LIBEXEC_DIR) conf.set('VERSION', meson.project_version()) conf.set('PYTHON', python_bin.path()) diff --git a/search-provider/lollypop-sp.in b/search-provider/lollypop-sp.in index 59201064..8e91b4fd 100755 --- a/search-provider/lollypop-sp.in +++ b/search-provider/lollypop-sp.in @@ -12,10 +12,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import sys -# Make sure we'll find the pygobject module, even in JHBuild -sys.path.insert(1, '@PYTHON_EXEC_DIR@') -# Make sure we'll find the lollypop modules, even in JHBuild -sys.path.insert(1, '@PYTHON_DIR@') import gi gi.require_version('Secret', '1') -- 2.19.0
