From 47f4474beef993eebbabe67d24f8ad869e9f70dd0d21d1a6a7aab16e442b50f6 Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Mon, 8 May 2017 07:54:42 +0000
Subject: [PATCH] Accepting request 493377 from
 home:bmwiedemann:branches:games:tools

use p7zip for deterministic archive file order
and strip-nondeterminism to have fully reproducible builds
use convert -strip to make build more reproducible

OBS-URL: https://build.opensuse.org/request/show/493377
OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=12
---
 slade.changes | 11 +++++++++++
 slade.spec    | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/slade.changes b/slade.changes
index def877e..fb4e23f 100644
--- a/slade.changes
+++ b/slade.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun May  7 09:00:30 UTC 2017 - bwiedemann@suse.com
+
+- use p7zip for deterministic archive file order
+  and strip-nondeterminism to have fully reproducible builds
+
+-------------------------------------------------------------------
+Tue May  2 13:04:33 UTC 2017 - bwiedemann@suse.com
+
+- use convert -strip to make build more reproducible
+
 -------------------------------------------------------------------
 Fri Feb 10 01:19:39 UTC 2017 - luke.nukem.jones@gmail.com
 
diff --git a/slade.spec b/slade.spec
index e9b5733..83be979 100644
--- a/slade.spec
+++ b/slade.spec
@@ -35,7 +35,7 @@ BuildRequires:  freeimage-devel
 BuildRequires:  gcc-c++
 BuildRequires:  update-desktop-files
 BuildRequires:  wxWidgets-3_0-devel
-BuildRequires:  zip
+BuildRequires:  p7zip
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(ftgl)
 BuildRequires:  pkgconfig(gl)
@@ -43,6 +43,9 @@ BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(sfml-all)
 BuildRequires:  pkgconfig(x11)
+%if 0%{?suse_version} > 1320
+BuildRequires:  strip-nondeterminism
+%endif
 
 %description
 SLADE3 is a modern editor for Doom-engine based games and source
@@ -59,11 +62,14 @@ from/to other generic formats such as PNG.
 make %{?_smp_mflags}
 
 %install
+%if 0%{?suse_version} > 1320
+strip-nondeterminism build/slade.pk3
+%endif
 b="%buildroot"
 install -Dm755 build/slade "$b/%_bindir/slade"
 install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"
 
-convert "build/msvc/slade.ico[0]" -alpha on "%name.png"
+convert -strip "build/msvc/slade.ico[0]" -alpha on "%name.png"
 install -Dpm0644 "%name.png" "$b/%_datadir/pixmaps/%name.png"
 install -Dpm0644 %{SOURCE100} "$b/%_datadir/appdata/%name.appdata.xml"