rpms/freedroidrpg/devel freedroidrpg-0.10.0-gcc4.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 freedroidrpg.spec, 1.14, 1.15 sources, 1.5, 1.6

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/freedroidrpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13781

Modified Files:
	.cvsignore freedroidrpg.spec sources 
Added Files:
	freedroidrpg-0.10.0-gcc4.patch 
Log Message:
Update to 0.10.0 with some other spec file cleanup



freedroidrpg-0.10.0-gcc4.patch:

--- NEW FILE freedroidrpg-0.10.0-gcc4.patch ---
--- map.c	2006-12-30 12:41:17.000000000 +0100
+++ /src/cvs/FreeDroid/src/map.c	2007-01-10 11:56:48.000000000 +0100
@@ -3661,6 +3661,7 @@
 int
 IsPassable ( float x , float y , int z )
 {
+    if ( z < 0 ) { fprintf ( stderr, "%s: got a negative z. Probable GCC4 bug.", __FUNCTION__); return; }
     Level PassLevel = curShip . AllLevels [ z ] ;
     int x_tile_start, y_tile_start;
     int x_tile_end, y_tile_end;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Sep 2005 21:17:13 -0000	1.5
+++ .cvsignore	11 Jan 2007 06:54:09 -0000	1.6
@@ -1 +1 @@
-freedroidrpg-0.9.13.tar.bz2
+freedroidrpg-0.10.0.tar.bz2


Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freedroidrpg.spec	2 Sep 2006 02:33:15 -0000	1.14
+++ freedroidrpg.spec	11 Jan 2007 06:54:09 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           freedroidrpg
-Version:        0.9.13
-Release:        3%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        Role playing game with Freedroid theme and Tux as the hero
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://freedroid.sourceforge.net/
 Source0:        http://download.sf.net/freedroid/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         freedroidrpg-0.10.0-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel
@@ -28,10 +29,11 @@
 
 %prep
 %setup -q
+%patch0 -p4
 
 
 %build
-%configure --datadir=%{_datadir}/games --disable-dependency-tracking
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -47,9 +49,9 @@
 convert -transparent "#077300" graphics/paraicon.bmp \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png
 # Fix permissions, remove extra junk.
-find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -name "*.sh" | xargs rm
-rm -r $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg/graphics/blender_sources
-find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -type f | xargs chmod -x
+find $RPM_BUILD_ROOT%{_datadir}/%{name} -name "*.sh" | xargs rm
+rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/graphics/blender_sources
+find $RPM_BUILD_ROOT%{_datadir}/%{name} -type f | xargs chmod -x
 
 
 %clean
@@ -57,23 +59,35 @@
 
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README TODO
+%doc AUTHORS COPYING README
 %{_bindir}/*
-%{_datadir}/games/freedroidrpg/
+%{_datadir}/%{name}
 %{_mandir}/man6/freedroidRPG.6*
 %{_datadir}/applications/*freedroidrpg.desktop
 %{_datadir}/icons/hicolor/32x32/apps/freedroidrpg.png
 
 
 %changelog
+* Wed Jan 10 2007 Wart <wart at kobold.org> - 0.10.0-1
+- Update to 0.10.0
+- Update the icon cache scriptlet to the Fedora recommendation
+- Move game data out of /usr/share/games and into /usr/share/<name>,
+  per the Games SIG recommendation.
+
 * Fri Sep 1 2006 Wart <wart at kobold.org> - 0.9.13-3
 - Rebuild for Fedora Extras
 - Change BR: for opengl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Sep 2005 21:17:13 -0000	1.5
+++ sources	11 Jan 2007 06:54:09 -0000	1.6
@@ -1 +1 @@
-d57e366a69e8999f5f0e30e960f72d15  freedroidrpg-0.9.13.tar.bz2
+b649fbee5df27c7b9b1252bd0568f956  freedroidrpg-0.10.0.tar.bz2