Request 4367 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request supersedes: request 4365 (Show diff)

Overview

Request 4367 (accepted)

- Update to version 1.12.0:
* Upgrade to Solarus 1.6.
* Add the Solarus team logo.
* Change the sound of the Solarus logo.
* Fix typos in French dialogs.
* Add a .desktop file.
- Remove upstreamed patches:
* zsdx-1.11.0-dont-require-cpp-compiler.patch.
* zsdx-1.11.0-reproducible-build.patch.
- Add _service file to retrieve archive more easily (project has
moved from github to gitlab).
- Drop hack in %post to add quest to solarus laucher.
- Update "License:" field as per upstream's license.txt.

Created by Antoine over 5 years ago
In state accepted
Package maintainer: Mailaender
Supersedes 4365

Submit zsdx

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

zsdx.changes Changed

zsdx.spec Changed

@@ -18,20 +18,17 @@
 
 
 Name:           zsdx
-Version:        1.11.0
+Version:        1.12.0
 Release:        0
 Summary:        Zelda Mystery of Solarus DX
-License:        GPL-3.0-only AND CC-BY-SA-3.0 AND NonFree
+License:        GPL-3.0-only AND CC-BY-SA-4.0 AND NonFree
 Group:          Amusements/Games/RPG
 URL:            http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
-Source:         https://github.com/christopho/zsdx/archive/%{name}-%{version}.tar.gz
-# 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
+Source:         %{name}-%{version}.tar.xz
 BuildRequires:  cmake
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  zip
-Requires(post): solarus >= 1.5
+Requires:       solarus >= 1.6
 BuildArch:      noarch
 
 %description
@@ -43,9 +40,7 @@
 designed for this game.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 # Touch files to ensure zip will produce a deterministic output
 # See https://reproducible-builds.org/docs/archives/
@@ -59,14 +54,7 @@
 make %{?_smp_mflags}
 
 %install
-cd build
-%make_install
-
-%post
-if [ -n "$DISPLAY" ]; then
-    # Add quest to solarus launcher
-    solarus -add %{_datadir}/solarus/zsdx/
-fi
+%cmake_install
 
 %files
 %doc readme.md changelog.txt
@@ -75,5 +63,12 @@
 %dir %{_datadir}/solarus/
 %dir %{_datadir}/solarus/zsdx
 %{_datadir}/solarus/zsdx/data.solarus
+%{_datadir}/applications/zsdx.desktop
+%{_datadir}/icons/hicolor/*/apps/zsdx.png
+%{_datadir}/pixmaps/zsdx.png
+# Own these directories because hicolor-icon-theme doesn't provide such
+# a resolution: 1024x1024
+%dir %{_datadir}/icons/hicolor/1024x1024
+%dir %{_datadir}/icons/hicolor/1024x1024/apps
 
 %changelog

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

zsdx-1.11.0-reproducible-build.patch Deleted

_service Added

_servicedata Added

zsdx-1.11.0.tar.gz -> zsdx-1.12.0.tar.xz Changed

Build Results
RPM Lint

Refresh

Comments for request 4367 0

Request History

Antoine created request over 5 years ago

olh accepted request over 5 years ago