[blobby] - Updated to latest upstream release rc4

[Ankur Sinha]

commit f9c1c3e8b6b1fc45f377dd68e3156b75db205295
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date:   Tue Dec 3 13:09:23 2013 +1100

    - Updated to latest upstream release rc4
    
    Also added an appdata file.
    This release makes use of SDL2.
    Also generated icon from the file provided, rather than an image file as
    earlier.

 .gitignore         |    1 +
 Makefile           |   21 ---------------------
 blobby.appdata.xml |   26 ++++++++++++++++++++++++++
 blobby.spec        |   24 +++++++++++++++++++-----
 sources            |    2 +-
 5 files changed, 47 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7958eb0..321c3a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ blobby2-linux-0.9b.tar.gz
 /blobby2-linux-0.9c.tar.gz
 /blobby2-linux-1.0rc1.tar.gz
 /blobby2-linux-1.0rc3.tar.gz
+/blobby2-linux-1.0rc4.tar.gz
diff --git a/blobby.appdata.xml b/blobby.appdata.xml
new file mode 100644
index 0000000..34bf32a
--- /dev/null
+++ b/blobby.appdata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+    <id type="desktop">blobby.desktop</id>
+    <licence>CC0</licence>
+    <description>
+        <!-- The website is in German. I've combined stuff from the wiki
+             translation and the translation of the about page on the website for this
+        -->
+
+        <p> Blobby Volley2 is a sequel to the popular game Blobby Volley that was last
+            released in 2000. It is a computer - skill game in which two alien gummy
+            bears (blobs) compete in volleyball against each other.
+        </p> 
+        <p> 
+            It is both simple and fun. Due to the relative brevity of the game, it
+            is often used as a game played to take a quick rest from work.
+        </p>
+    </description>
+    <url type="homepage">http://blobby.sourceforge.net/</url>
+    <!-- None available on the site
+    <screenshots>
+        <screenshot type="default"></screenshot>
+    </screenshots>
+    -->
+    <updatecontact>Daniel-Knobe(at)web.de</updatecontact>
+</application>
diff --git a/blobby.spec b/blobby.spec
index b0f902b..3cd655e 100644
--- a/blobby.spec
+++ b/blobby.spec
@@ -1,16 +1,18 @@
-%global prerel rc3
+%global prerel rc4
 
 Name:           blobby
 Version:        1.0
-Release:        0.6.%{prerel}%{?dist}
+Release:        0.7.%{prerel}%{?dist}
 Summary:        Volley-ball game
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://blobby.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}2-linux-%{version}%{prerel}.tar.gz
 Source1:        blobby.desktop
-BuildRequires:  SDL-devel, physfs-devel, zlib-devel, cmake, boost-devel, zip
+Source2:        blobby.appdata.xml
+BuildRequires:  SDL2-devel, physfs-devel, zlib-devel, cmake, boost-devel, zip
 BuildRequires:  ImageMagick, desktop-file-utils, hicolor-icon-theme
+BuildRequires:  pkgconfig
 
 %description
 Blobby Volley is one of the most popular freeware games.
@@ -19,6 +21,9 @@ Blobby Volley 2 is the continuation of this lovely game.
 %prep
 %setup -q -n %{name}-%{version}%{prerel}
 
+# Updated to SDL2 but still looks for SDL also? Why!
+sed -ibackup '/find_package(SDL REQUIRED)/d' src/CMakeLists.txt
+
 %build
 %cmake .
 make %{?_smp_mflags}
@@ -27,14 +32,17 @@ make %{?_smp_mflags}
 %make_install
 
 # Icon
-unzip -o -j data/gfx.zip gfx/ball01.bmp
-convert -size 48x48 -transparent black ball01.bmp blobby.png
+# unzip -o -j data/gfx.zip gfx/ball01.bmp
+convert -size 48x48 -transparent black data/Icon.bmp blobby.png
 install -p -m 644 -D blobby.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/blobby.png
 
 # Desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata/
+install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/appdata/blobby.appdata.xml
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -50,8 +58,14 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/blobby
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/applications/*.desktop
+%dir %{_datadir}/appdata/
+%{_datadir}/appdata/%{name}.appdata.xml
 
 %changelog
+* Tue Dec 03 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.0-0.7.rc4
+- Update to rc4
+- Add appdata file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.rc3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b98f23f..0a91839 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4b7d3133e99806dc8b60a59da296906  blobby2-linux-1.0rc3.tar.gz
+0124ebbb6cf06d053d6a1bcc12b1a89d  blobby2-linux-1.0rc4.tar.gz