Request 4221 (accepted)

This request supersedes: request 4218 (Show diff)

Overview

Request 4221 (accepted)

- Make build reproducible:
* Add zsdx-1.11.0-reproducible-build.patch: Sort data files list
before zipping.
* Touch data files in order to have timestamps such as zip
produces a deterministic output.
- Drop useless C++ compiler requirement:
* Add zsdx-1.11.0-dont-require-cpp-compiler.patch: Set NONE as
supported language to prevent CMake from checking default
languages (C, C++).
- Add quest to solarus launcher in %post.
- Use %license instead of %doc for license file (boo#1082318).
- Clean with spec-cleaner.

Created by Antoine about 6 years ago
In state accepted
Package maintainer: Mailaender
Supersedes 4218

Submit zsdx

Submit package home:Antoine:branches:Games / zsdx to package Games / zsdx

zsdx.changes Changed

zsdx.spec Changed

@@ -2,6 +2,7 @@
 # spec file for package zsdx
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 The Packman Team.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +21,18 @@
 Version:        1.11.0
 Release:        0
 Summary:        Zelda Mystery of Solarus DX
-License:        GPL-3.0 and CC-BY-SA-3.0 and SUSE-NonFree
+License:        GPL-3.0-only AND CC-BY-SA-3.0 AND NonFree
 Group:          Amusements/Games/RPG
-Url:            http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
+URL:            http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
 Source:         https://github.com/christopho/zsdx/archive/%{name}-%{version}.tar.gz
-BuildArch:      noarch
+# PATCH-FIX-UPSTREAM zsdx-1.11.0-dont-require-cpp-compiler.patch -- it's not written in C++
+Patch0:         zsdx-1.11.0-dont-require-cpp-compiler.patch
+# PATCH-FIX-UPSTREAM zsdx-1.11.0-reproducible-build.patch -- attempt to make the build reproducible
+Patch1:         zsdx-1.11.0-reproducible-build.patch
 BuildRequires:  cmake
-BuildRequires:  gcc-c++
 BuildRequires:  zip
-Requires:       solarus >= 1.5
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires(post): solarus >= 1.5
+BuildArch:      noarch
 
 %description
 The Legend of Zelda: Mystery of Solarus DX is set to be a
@@ -41,6 +44,15 @@
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+# Touch files to ensure zip will produce a deterministic output
+# See https://reproducible-builds.org/docs/archives/
+if [ -n "$SOURCE_DATE_EPOCH" ]; then
+    find data -print0 | 
+        xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
+fi
 
 %build
 %cmake
@@ -48,11 +60,17 @@
 
 %install
 cd build
-make DESTDIR=%{buildroot} install
+%make_install
+
+%post
+if [ -n "$DISPLAY" ]; then
+    # Add quest to solarus launcher
+    solarus -add %{_datadir}/solarus/zsdx/
+fi
 
 %files
-%defattr(-,root,root,-)
-%doc readme.md license.txt changelog.txt
+%doc readme.md changelog.txt
+%license license.txt
 %{_bindir}/zsdx
 %dir %{_datadir}/solarus/
 %dir %{_datadir}/solarus/zsdx

zsdx-1.11.0-dont-require-cpp-compiler.patch Added

zsdx-1.11.0-reproducible-build.patch Added

Build Results
RPM Lint

Refresh

Mentioned Issues (1)

boo#1082318

Comments for request 4221 0
Comments for request 4218 1

Antoine wrote about 6 years ago

The two patches have been applied upstream so they will be included in the next release.

Request History

Antoine created request about 6 years ago

olh accepted request about 6 years ago