[wastesedge] Update to the latest upstream release

[Mathieu Bridon]

commit 03fcf2959a07536732d70fb7cf50dda86cf6b891
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Fri Sep 21 14:41:16 2012 +0800

    Update to the latest upstream release
    
    The only changes with the previous one are:
    - it now includes a desktop file
    - the configure patch I was using got merged
    
    But these are in fact the only two changes, so that's a pretty
    uninteresting release, which is why I postponed updating for so
    long.
    
    Now that I set up the upstream tracking thing to bug me, I can't
    ignore it any more though. :)

 .gitignore                                       |    1 +
 sources                                          |    2 +-
 wastesedge-0.3.5-Fix-upstream-desktop-file.patch |   33 ++++++++++++++++++++++
 wastesedge-more.patch                            |   15 ----------
 wastesedge.desktop                               |    9 ------
 wastesedge.spec                                  |   25 ++++++++++------
 6 files changed, 51 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7181d8..f3aedb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 wastesedge-src-0.3.4-modified.tar.gz
+/wastesedge-src-0.3.5-modified.tar.gz
diff --git a/sources b/sources
index ac2d781..8256f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fceb6c6f3a345e2a3dc1b0ea3998b436  wastesedge-src-0.3.4-modified.tar.gz
+b07931dba88172e718e6b90e98af3c39  wastesedge-src-0.3.5-modified.tar.gz
diff --git a/wastesedge-0.3.5-Fix-upstream-desktop-file.patch b/wastesedge-0.3.5-Fix-upstream-desktop-file.patch
new file mode 100644
index 0000000..58bfd50
--- /dev/null
+++ b/wastesedge-0.3.5-Fix-upstream-desktop-file.patch
@@ -0,0 +1,33 @@
+From 94ef1474815a7f1b7fa5d22346d3746f5e6ba350 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha at fedoraproject.org>
+Date: Fri, 21 Sep 2012 11:56:31 +0800
+Subject: [PATCH] Fix upstream desktop file
+
+The  key is supposed to represent the version of the
+Desktop Entry Spec, not of the application.
+
+Also, while we're at it, remove the deprecated  key.
+---
+ wastesedge.desktop.in |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/wastesedge.desktop.in b/wastesedge.desktop.in
+index de5c20c..813a1cb 100644
+--- a/wastesedge.desktop.in
++++ b/wastesedge.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Waste's Edge
+ GenericName=Waste's Edge
+ Comment=A 2D graphical RPG
+@@ -8,5 +7,5 @@ Icon=wastesedge
+ Terminal=false
+ Type=Application
+ Categories=Game;RolePlaying;
+-Version=@VERSION@
++Version=1.0
+ 
+-- 
+1.7.7.6
+
diff --git a/wastesedge.spec b/wastesedge.spec
index 52ba383..4a6a01b 100644
--- a/wastesedge.spec
+++ b/wastesedge.spec
@@ -1,6 +1,6 @@
 Name:           wastesedge
-Version:        0.3.4
-Release:        0.18%{?dist}
+Version:        0.3.5
+Release:        1%{?dist}
 Summary:        Official game package for Adonthell
 
 License:        GPL+
@@ -15,9 +15,13 @@ URL:            http://adonthell.linuxgames.com/
 # $ sed -i 's|avatar.ttf||g' wastesedge-$VERSION/gfx/window/font/Makefile.in
 # $ tar czvf wastesedge-src-$VERSION-modified.tar.gz wastesedge-$VERSION/
 Source0:        %{name}-src-%{version}-modified.tar.gz
-Source1:        %{name}.desktop
 
-Patch0:         %{name}-more.patch
+# This release is 4 years old and upstream moved on since then to work on
+# adonthell/wastesedge 0.4 (and I'll update to it once it's ready). So they
+# aren't really interested in this old version any more, and I won't bother
+# them with something as trivial, unless I have another more important patch
+# to submit at the same time.
+Patch0:         wastesedge-0.3.5-Fix-upstream-desktop-file.patch
 
 BuildArch:      noarch
 
@@ -46,8 +50,7 @@ chmod a-x AUTHORS COPYING INSTALL README
 # install locale files in the right place
 sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in
 
-# patch configure to not use "more" any more
-%patch0 -p0
+%patch0 -p1
 
 
 %build
@@ -63,10 +66,10 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
 mv %{buildroot}%{_datadir}/pixmaps/%{name}_16x16.xpm %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
 mv %{buildroot}%{_datadir}/pixmaps/%{name}_32x32.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 
-# install desktop file not provided upstream
-desktop-file-install --vendor=""                      \
+# install desktop file
+desktop-file-install                               \
         --dir=%{buildroot}%{_datadir}/applications \
-        %{SOURCE1}
+        %{name}.desktop
 
 %find_lang %{name}
 
@@ -94,6 +97,10 @@ fi
 
 
 %changelog
+* Fri Sep 21 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.5-1
+- Update to the latest upstream release.
+- Cleanup and modernize the spec file.
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-0.18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild