rpms/glaxium/devel glaxium-0.5-fixes.patch, 1.1, 1.2 glaxium.spec, 1.6, 1.7

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/glaxium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1993

Modified Files:
	glaxium-0.5-fixes.patch glaxium.spec 
Log Message:
* Tue Feb 16 2010 Hans de Goede <hdegoede at redhat.com> 0.5-8
- Fix FTBFS (#564699)


glaxium-0.5-fixes.patch:
 Makefile.in   |    4 ++--
 scratcher.hpp |    2 +-
 tank.hpp      |    2 +-
 variables.cpp |    1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

Index: glaxium-0.5-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glaxium/devel/glaxium-0.5-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glaxium-0.5-fixes.patch	9 Oct 2007 17:35:24 -0000	1.1
+++ glaxium-0.5-fixes.patch	16 Feb 2010 12:29:24 -0000	1.2
@@ -33,3 +33,24 @@ diff -up glaxium_0.5/variables.cpp.fix g
  #endif
  }
  
+diff -up glaxium_0.5/Makefile.in~ glaxium_0.5/Makefile.in
+--- glaxium_0.5/Makefile.in~	2010-02-16 13:20:12.000000000 +0100
++++ glaxium_0.5/Makefile.in	2010-02-16 13:21:14.984680703 +0100
+@@ -1,7 +1,7 @@
+ 
+ CC=@CXX@
+ INCLUDE=@CFLAGS@ @CPPFLAGS@
+-LIB=@LIBS@
++LIB=@LIBS@ -lm
+ 
+ OBJ= $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+ DATE=`date +"%d.%m.%Y"`
+@@ -19,7 +19,7 @@ GLAXIUM_HOME=$(datadir)/glaxium
+ MAN_DIR=$(mandir)
+ 
+ glaxium : $(OBJ)
+-	gcc -g -o glaxium $(OBJ) $(LIB)
++	g++ -g -o glaxium $(OBJ) $(LIB)
+ 
+ 
+ 


Index: glaxium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glaxium/devel/glaxium.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glaxium.spec	7 Jan 2010 10:47:40 -0000	1.6
+++ glaxium.spec	16 Feb 2010 12:29:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           glaxium
 Version:        0.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An OpenGL space shooter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -58,17 +58,17 @@ 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
 %defattr(-,root,root,-)
@@ -81,6 +81,9 @@ fi
 
 
 %changelog
+* Tue Feb 16 2010 Hans de Goede <hdegoede at redhat.com> 0.5-8
+- Fix FTBFS (#564699)
+
 * Thu Jan  7 2010 Hans de Goede <hdegoede at redhat.com> 0.5-7
 - Fix crash when the level of the game with tanks is reached (#553067)