[pipepanic] Fixed wrong score with long pipes (BZ #847344)

[musuruan]

commit b2bdda2fc9f0574d625e21cfdef738d62b74e59a
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sun Aug 12 17:13:26 2012 +0200

    Fixed wrong score with long pipes (BZ #847344)
    
    - Fixed desktop file
    - Updated icon cache scriptlets

 pipepanic-0.1.3-score.patch |   12 ++++++++++++
 pipepanic.desktop           |    4 ++--
 pipepanic.spec              |   28 ++++++++++++++++++++--------
 3 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/pipepanic-0.1.3-score.patch b/pipepanic-0.1.3-score.patch
new file mode 100644
index 0000000..65eed76
--- /dev/null
+++ b/pipepanic-0.1.3-score.patch
@@ -0,0 +1,12 @@
+diff -up pipepanic-0.1.3-source/main.h.orig pipepanic-0.1.3-source/main.h
+--- pipepanic-0.1.3-source/main.h.orig	2006-05-16 22:11:29.000000000 +0200
++++ pipepanic-0.1.3-source/main.h	2012-06-24 19:22:01.141693770 +0200
+@@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #define PREVIEWARRAYSIZE 3
+ #define POINTSARRAYSIZE 75
+ 
+-#define LEAKYPIPEVAL +50
++#define LEAKYPIPEVAL +100
+ #define NULLPIPEVAL 255
+ #define DEADPIPEVAL 253
+ #define FILLEDCOUNTERBASE 20
diff --git a/pipepanic.desktop b/pipepanic.desktop
index 7673825..e990eee 100644
--- a/pipepanic.desktop
+++ b/pipepanic.desktop
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Name=Pipepanic 
 Comment=A pipe connecting game
 Exec=pipepanic
-Icon=pipepanic.png
+Icon=pipepanic
 Terminal=false
 Type=Application
-Categories=Game;LogicGame
+Categories=Game;LogicGame;
 
diff --git a/pipepanic.spec b/pipepanic.spec
index 0005b59..344d91c 100644
--- a/pipepanic.spec
+++ b/pipepanic.spec
@@ -1,6 +1,6 @@
 Name: pipepanic
 Version: 0.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: A pipe connecting game       
 
 Group: Amusements/Games
@@ -8,9 +8,14 @@ License: GPLv2+
 URL: http://www.users.waitrose.com/~thunor/pipepanic/
 Source0: http://www.users.waitrose.com/~thunor/pipepanic/dload/%{name}-%{version}-source.tar.gz
 Source1: pipepanic.desktop
+# Use standard Fedora CFLAGS to compile
 Patch0: pipepanic-0.1.3-Makefile.patch
 # Hans de Goede
+# Set a window title and icon
 Patch1: pipepanic-0.1.3-window-title.patch
+# Miroslav Lichvar
+# Fix wrong score with long pipes (BZ #847344)
+Patch2: pipepanic-0.1.3-score.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: SDL-devel
@@ -28,6 +33,7 @@ different shaped pipes together as possible within the time given.
 %setup -q -n %{name}-%{version}-source
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 # Fix file encoding
 iconv --from=ISO-8859-1 --to=UTF-8 COPYING-ARTWORK > COPYING-ARTWORK.conv 
@@ -77,19 +83,20 @@ rm -rf %{buildroot}
 
 
 %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,-)
 %{_bindir}/pipepanic
@@ -103,6 +110,11 @@ fi
 
 
 %changelog
+* Sun Aug 12 2012 Andrea Musuruane <musuruan at gmail.com> 0.1.3-11
+- Fixed wrong score with long pipes (BZ #847344)
+- Fixed desktop file
+- Updated icon cache scriptlets
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild