[scummvm] new upstream release

[Christian Krause]

commit 0a3caa78cfbfe303e975cd89104e1ba4086425c9
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Jul 28 11:14:50 2012 +0200

    new upstream release
    
    - use shipped SVG icon instead of manually extracted PNG files
    - add shipped XPM icon for openbox compatibility
    - update Icon Cache scriptlets

 .gitignore   |    1 +
 scummvm.spec |   44 ++++++++++++++++++++++----------------------
 sources      |    3 +--
 3 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4853fdf..721413d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ scummvm-icons.tar.gz
 /scummvm-1.3.1.tar.bz2
 /scummvm-1.4.0.tar.bz2
 /scummvm-1.4.1.tar.bz2
+/scummvm-1.5.0.tar.bz2
diff --git a/scummvm.spec b/scummvm.spec
index 75b9daa..94edb49 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,13 +1,11 @@
 Name:		scummvm
-Version:	1.4.1
-Release:	2%{?dist}
+Version:	1.5.0
+Release:	1%{?dist}
 Summary:	Interpreter for several adventure games
 Group:		Applications/Emulators
 License:	GPLv2+
 URL:		http://scummvm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-#######		Icons extracted from icons/scummvm.ico with the gimp
-Source1:	scummvm-icons.tar.gz
 Patch0:		scummvm-1.2.0-nostrip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel libvorbis-devel flac-devel zlib-devel
@@ -35,7 +33,7 @@ The complete list can be found on ScummVM's compatibility page:
 http://scummvm.org/compatibility/%{version}/
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
@@ -65,15 +63,8 @@ desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	dists/%{name}.desktop
 
-install -D -p -m 0644 %{name}-16x16.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -D -p -m 0644 %{name}-32x32.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -D -p -m 0644 %{name}-48x48.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -D -p -m 0644 %{name}-128x128.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
+install -D -p -m 0644 icons/%{name}.svg \
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 
 %clean
@@ -81,18 +72,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
@@ -100,10 +93,17 @@ fi
 %{_datadir}/%{name}/
 %{_mandir}/man6/%{name}.6*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.svg
+%{_datadir}/pixmaps/%{name}.xpm
 
 
 %changelog
+* Sat Jul 28 2012 Christian Krause <chkr at fedoraproject.org> - 1.5.0-1
+- new upstream release
+- use shipped SVG icon instead of manually extracted PNG files
+- add shipped XPM icon for openbox compatibility
+- update Icon Cache scriptlets
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f6a5e69..c81ac83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz
-aa094c2224aad22d5340a1d2d919c883  scummvm-1.4.1.tar.bz2
+d71d1df5c8262556fedbe885972fbf6e  scummvm-1.5.0.tar.bz2