Author: scop
Update of /cvs/extras/rpms/freedroidrpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6369
Modified Files:
.cvsignore freedroidrpg.desktop freedroidrpg.spec sources
Added Files:
freedroidrpg-lvalue.patch
Log Message:
* Sun Jul 31 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0.9.13-0.2.rc2
- 0.9.13rc2.
- Apply upstream lvalue cast fix.
- Update desktop entry categories.
freedroidrpg-lvalue.patch:
--- NEW FILE freedroidrpg-lvalue.patch ---
--- freedroid/FreeDroid/src/map.c 2005/07/11 08:11:35 1.326
+++ freedroid/FreeDroid/src/map.c 2005/07/18 18:18:18 1.327
@@ -2408,7 +2408,7 @@
/* read MapData */
for (i = 0; i < loadlevel->ylen; i++)
- if ( ( (char*)loadlevel -> map[i] = strtok ( NULL, "\n") ) == NULL)
+ if ( ( loadlevel -> map[i] = (void *)strtok ( NULL, "\n") ) == NULL)
return NULL;
/* Get Waypoints */
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:23:35 -0000 1.3
+++ .cvsignore 31 Jul 2005 17:08:29 -0000 1.4
@@ -1 +1 @@
-freedroidrpg-0.9.12.tar.bz2
+freedroidrpg-0.9.13-rc2.tar.bz2
Index: freedroidrpg.desktop
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freedroidrpg.desktop 8 Nov 2004 04:23:35 -0000 1.2
+++ freedroidrpg.desktop 31 Jul 2005 17:08:29 -0000 1.3
@@ -6,4 +6,4 @@
Terminal=false
Type=Application
Encoding=UTF-8
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ArcadeGame;RolePlaying;
Index: freedroidrpg.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freedroidrpg.spec 10 Jun 2005 06:30:53 -0000 1.9
+++ freedroidrpg.spec 31 Jul 2005 17:08:29 -0000 1.10
@@ -1,13 +1,14 @@
Name: freedroidrpg
-Version: 0.9.12
-Release: 5
+Version: 0.9.13
+Release: 0.2.rc2
Summary: Role playing game with Freedroid theme and Tux as the hero
Group: Amusements/Games
License: GPL
URL:
http://freedroid.sourceforge.net/
-Source0:
http://download.sf.net/freedroid/%{name}-%{version}.tar.bz2
+Source0:
http://download.sf.net/freedroid/%{name}-%{version}-rc2.tar.bz2
Source1: %{name}.desktop
+Patch0: %{name}-lvalue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
@@ -27,7 +28,8 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc2
+%patch0 -p2
%build
@@ -46,10 +48,11 @@
--add-category X-Fedora \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-convert graphics/paraicon.bmp \
+convert -resize 48x48 graphics/droids/001.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/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
@@ -68,6 +71,11 @@
%changelog
+* Sun Jul 31 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0.9.13-0.2.rc2
+- 0.9.13rc2.
+- Apply upstream lvalue cast fix.
+- Update desktop entry categories.
+
* Thu Jun 9 2005 Ville Skytt�� <ville.skytta at iki.fi> - 0.9.12-5
- Rebuild for FC4+ with compat-gcc-32 due to crashy gcc4 experience (#152498).
- Build with dependency tracking disabled.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:23:35 -0000 1.3
+++ sources 31 Jul 2005 17:08:29 -0000 1.4
@@ -1 +1 @@
-5b8b8e74e641c73645a7597ca8515707 freedroidrpg-0.9.12.tar.bz2
+eda34581d784cbd1db59ebc46208880e freedroidrpg-0.9.13-rc2.tar.bz2