rpms/lacewing/devel lacewing.desktop, 1.3, 1.4 lacewing.patch, 1.1, 1.2 lacewing.spec, 1.12, 1.13

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	lacewing.desktop lacewing.patch lacewing.spec 
Log Message:
* Mon Feb 15 2010 Hans de Goede <hdegoede at redhat.com> 1.10-14
- Fix FTBFS (#564669)



Index: lacewing.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/lacewing/devel/lacewing.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lacewing.desktop	12 Aug 2007 09:34:22 -0000	1.3
+++ lacewing.desktop	15 Feb 2010 22:00:35 -0000	1.4
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Lacewing
 Comment=A cross between Spacewar and Centipede
 Exec=lacewing
-Icon=lacewing.png
+Icon=lacewing
 Terminal=false
 StartupNotify=false
 Type=Application

lacewing.patch:
 Makefile   |   28 ++++++++++++++
 config.h   |   12 ++++++
 displ_in.c |   16 ++++----
 display.c  |   24 +++++++-----
 game.c     |   19 +++++----
 main.c     |   54 ++++++++-------------------
 menu.c     |  119 +++++++++++++++++++++++++++++++++++++++++++------------------
 menu.h     |    2 +
 ships.c    |    3 +
 sound.c    |   13 ++----
 stars.c    |    2 -
 11 files changed, 183 insertions(+), 109 deletions(-)

Index: lacewing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lacewing/devel/lacewing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lacewing.patch	30 Jan 2006 21:34:11 -0000	1.1
+++ lacewing.patch	15 Feb 2010 22:00:35 -0000	1.2
@@ -5,7 +5,7 @@ diff -urN lacewing.orig/Makefile lacewin
 +PREFIX  = /home/opt
 +DATADIR = $(PREFIX)/share/$(TARGET)
 +CFLAGS  = -g -Wall -O2
-+LDFLAGS = `allegro-config --libs`
++LDFLAGS = `allegro-config --libs` -lm
 +DEFINES = -DDATADIR=\"$(DATADIR)/\"
 +OBJS    = actor.o bullet.o cloud.o cmds.o displ_in.o display.o eclass.o \
 +          enemy.o game.o input.o levels.o main.o menu.o palette.o pickup.o \


Index: lacewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lacewing/devel/lacewing.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lacewing.spec	25 Jul 2009 04:52:27 -0000	1.12
+++ lacewing.spec	15 Feb 2010 22:00:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           lacewing
 Version:        1.10
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Arcade-style shoot-em-up
 Group:          Amusements/Games
 License:        GPLv2+
@@ -62,17 +62,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,-)
@@ -82,7 +82,11 @@ fi
 %{_datadir}/applications/fedora-lacewing.desktop
 %{_datadir}/icons/hicolor/48x48/apps/lacewing.png
 
+
 %changelog
+* Mon Feb 15 2010 Hans de Goede <hdegoede at redhat.com> 1.10-14
+- Fix FTBFS (#564669)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild