up to 2.2.1; appdata upstreamed

diff --git a/chocolate-doom.appdata.xml b/chocolate-doom.appdata.xml
deleted file mode 100644 (file)
index 9322e73..0000000
--- a/chocolate-doom.appdata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ravi Srinivasan <ravishankar.srinivasan@gmail.com> -->
-<!--
-BugReportURL: https://github.com/chocolate-doom/chocolate-doom/issues/406
-SentUpstream: 2014-09-24
--->
-<application>
-  <id type="desktop">chocolate-doom.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>A clone of the popular DOS game DOOM</summary>
-  <description>
-    <p>
-      Chocolate Doom is an original source port of the popular DOOM game for the PC.
-    </p>
-    <p>
-      It accurately reproduces the playing experience of the original DOOM game
-      and is compatible with the numerous mods and levels designed for the original.
-    </p>
-  </description>
-  <url type="homepage">http://chocolate-doom.org/</url>
-  <screenshots>
-    <screenshot type="default">http://www.chocolate-doom.org/wiki/images/a/a7/Chocolate-doom.png</screenshot>
-  </screenshots>
-</application>

diff --git a/chocolate-doom.spec b/chocolate-doom.spec
index 28d72329deb8d63ecd1836a74853a94bdfdd25c3..be9f02c702ab4eb84c39ebb202e6a84b26103e06 100644 (file)
--- a/chocolate-doom.spec
+++ b/chocolate-doom.spec
@@ -1,12 +1,11 @@
 Summary:       Historically compatible Doom engine
 Name:          chocolate-doom
-Version:       2.2.0
+Version:       2.2.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Games
 Source0:       http://www.chocolate-doom.org/downloads/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 8b32745d113f25fd0985a03a5d632ba5
-Source1:       %{name}.appdata.xml
+# Source0-md5: 20ef24c517f701023aa187c07b587ce6
 URL:           http://chocolate-doom.org/
 BuildRequires: SDL-devel
 BuildRequires: SDL_mixer-devel
@@ -48,10 +47,9 @@ rm -rf docs
 install -d docs
 mv $RPM_BUILD_ROOT%{_docdir}/chocolate-{doom,heretic,hexen,strife} docs
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/appdata}
+install -d $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_prefix}/games/* $RPM_BUILD_ROOT%{_bindir}
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/chocolate-heretic.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/chocolate-hexen.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/chocolate-strife.desktop