[hedgewars] Use upstream appdata and desktop files

Bruno Wolff III bruno at fedoraproject.org
Sat Jan 10 04:58:15 UTC 2015


commit b19be7203c4e7732b02c693fe2adad0ec8d64150
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Fri Jan 9 17:54:13 2015 -0600

    Use upstream appdata and desktop files

 hedgewars.appdata.xml |   37 -------------------------------------
 hedgewars.desktop     |   10 ----------
 hedgewars.spec        |    9 ++++-----
 3 files changed, 4 insertions(+), 52 deletions(-)
---
diff --git a/hedgewars.spec b/hedgewars.spec
index 5a15f9a..316a945 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -7,8 +7,6 @@ License:        GPL+
 URL:            http://www.hedgewars.org/
 # Note -3 upstream respun the tarbal...
 Source0:        http://download.gna.org/hedgewars/hedgewars-src-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Source2:        %{name}.appdata.xml
 # Text.Show.ByteString currently isn't available in Fedora and for the
 # the time being we need to use a patch to have hedgewars-server not
 # use that function.
@@ -113,9 +111,9 @@ install -p -m 644 misc/hedgewars_ico.png \
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/512x512/apps
 install -p -m 644 misc/hedgewars.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-install -p -m 644 %{SOURCE2} \
-  $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -p -m 644 misc/hedgewars.desktop \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %post
@@ -151,6 +149,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Fri Jan 09 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21.1-1
 - New upstream release with some distro patches
 - Reenable arm
+- Use upstream desktop and appdata files
 
 * Mon Jan 05 2015 Bruno Wolff III <bruno at wolff.to> - 0.9.21-3
 - Fix problem accessing font files


More information about the scm-commits mailing list