[trackballs] Drop guile-2.0 patch for now as Fedora is still at guile-1.8.x, and the guile-2.0 patch + gcc-4.7 br

[Hans de Goede]

commit fbd301799dd0f2366a9c241e838067bf8c1d023f
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Jan 15 20:43:06 2012 +0100

    Drop guile-2.0 patch for now as Fedora is still at guile-1.8.x, and
    the guile-2.0 patch + gcc-4.7 breaks building with 1.8.x

 trackballs.spec |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/trackballs.spec b/trackballs.spec
index 11405c5..7552607 100644
--- a/trackballs.spec
+++ b/trackballs.spec
@@ -1,6 +1,6 @@
 Name:           trackballs
 Version:        1.1.4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -13,7 +13,6 @@ Patch2:         trackballs-1.1.4-rh555877.patch
 Patch3:         trackballs-1.1.4-rh667236.patch
 Patch4:         trackballs-1.1.4-guile20.patch
 Patch5:         trackballs-1.1.4-remove-old-sdl-workarounds.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
 Requires:       hicolor-icon-theme opengl-games-utils dejavu-sans-fonts
@@ -30,7 +29,7 @@ quality soundeffects and background music.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+#patch4 -p1 #no guile20 in Fedora yet
 %patch5 -p1
 iconv -f ISO-8859-1 -t UTF8 share/%{name}.6 > share/%{name}.6.tmp
 mv share/%{name}.6.tmp share/%{name}.6
@@ -46,7 +45,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 %find_lang %{name}
@@ -61,26 +59,21 @@ desktop-file-install --vendor fedora            \
   %{SOURCE1}
 
 
-%clean
-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
+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
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING ChangeLog FAQ README TODO
-%defattr(-,root,root,-)
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
@@ -89,6 +82,10 @@ fi
 
 
 %changelog
+* Sun Jan 15 2012 Hans de Goede <hdegoede at redhat.com> - 1.1.4-17
+- Drop guile-2.0 patch for now as Fedora is still at guile-1.8.x, and
+  the guile-2.0 patch + gcc-4.7 breaks building with 1.8.x
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild