From 80ca2a36eaa8cf7cef2f3036ee4353ea0715fc5574e4d7289f6da1657fce9106 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Fri, 28 Feb 2020 15:41:24 +0000 Subject: [PATCH] Accepting request 780322 from home:adkorte Sort contents of .filemap to make build reproducible OBS-URL: https://build.opensuse.org/request/show/780322 OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php7-pear?expand=0&rev=17 --- php7-pear.changes | 5 +++++ php7-pear.spec | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/php7-pear.changes b/php7-pear.changes index 38e2a00..54c9e52 100644 --- a/php7-pear.changes +++ b/php7-pear.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 28 08:33:14 UTC 2020 - Arjen de Korte + +- Sort contents of .filemap to make build reproducible + ------------------------------------------------------------------- Sat Dec 7 22:57:56 UTC 2019 - Arjen de Korte diff --git a/php7-pear.spec b/php7-pear.spec index a5332a7..7310011 100644 --- a/php7-pear.spec +++ b/php7-pear.spec @@ -1,7 +1,7 @@ # # spec file for package php7-pear # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -98,6 +98,14 @@ php -d date.timezone=UTC -d memory_limit=64M -d short_open_tag=0 -d safe_mode=0 --metadata %{metadir} \ --www %{peardir}/htdocs +php -r '$line = file_get_contents("%{buildroot}%{metadir}/.filemap"); + $filemap = unserialize($line); + ksort($filemap); + foreach($filemap as &$value) { + ksort($value); + } + file_put_contents("%{buildroot}%{metadir}/.filemap", serialize($filemap));' + pushd %{buildroot}%{peardir} patch -p1 < %{PATCH0} popd