Author: musuruan Update of /cvs/nonfree/rpms/frogatto/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv4033 Modified Files: .cvsignore frogatto.spec sources Added Files: frogatto-1.1-Makefile.patch Removed Files: frogatto-1.0-Makefile.patch frogatto-1.0.3-gcc-4.6.patch Log Message: * Sat Jun 11 2011 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.1-1 - Updated to upstream 1.1 frogatto-1.1-Makefile.patch: Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE frogatto-1.1-Makefile.patch --- diff -durN frogatto-1.1.orig/Makefile frogatto-1.1/Makefile --- frogatto-1.1.orig/Makefile 2011-05-01 17:02:11.000000000 +0200 +++ frogatto-1.1/Makefile 2011-05-29 18:23:46.577981348 +0200 @@ -16,10 +16,10 @@ $(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $< game: $(objects) - $(CXX) -g $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics $(objects) -o game + $(CXX) -g $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics $(objects) -o game server: $(server_objects) - $(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server + $(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server poolalloc.o: src/poolalloc.c $(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wreturn-type -c src/poolalloc.c Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/frogatto/F-15/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Sep 2010 14:14:26 -0000 1.3 +++ .cvsignore 11 Jun 2011 20:26:34 -0000 1.4 @@ -1 +1 @@ -frogatto-1.0.3.tar.bz2 +frogatto-1.1.tar.bz2 Index: frogatto.spec =================================================================== RCS file: /cvs/nonfree/rpms/frogatto/F-15/frogatto.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- frogatto.spec 30 May 2011 11:24:45 -0000 1.4 +++ frogatto.spec 11 Jun 2011 20:26:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: frogatto -Version: 1.0.3 -Release: 3%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: An old-school 2D platform game Group: Amusements/Games @@ -12,8 +12,8 @@ Source2: %{name}.desktop Source3: %{name}.xpm Source4: %{name}.pod -Patch0: %{name}-1.0-Makefile.patch -Patch1: %{name}-1.0.3-gcc-4.6.patch +# Patch Makefile not to link lSDLmain +Patch0: %{name}-1.1-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.7 @@ -43,7 +43,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 + +# Fix locale file path +sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp %build @@ -64,6 +66,10 @@ cp -pr data images music sounds \ %{buildroot}%{_datadir}/%{name} +# Install translations +install -d %{buildroot}%{_datadir}/locale +cp -pr locale %{buildroot}%{_datadir} + # Install desktop file install -d %{buildroot}%{_datadir}/applications desktop-file-install \ @@ -82,6 +88,8 @@ -date="July 13th, 2010" \ %{SOURCE4} > %{buildroot}%{_mandir}/man6/%{name}.6 +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -102,7 +110,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files +%files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/%{name} @@ -114,6 +122,9 @@ %changelog +* Sat Jun 11 2011 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.1-1 +- Updated to upstream 1.1 + * Mon May 30 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.0.3-3 - Rebuilt for new boost (rf#1773) Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/frogatto/F-15/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Sep 2010 14:14:26 -0000 1.3 +++ sources 11 Jun 2011 20:26:34 -0000 1.4 @@ -1 +1 @@ -1e9ffe729c78c88d1e29147694299531 frogatto-1.0.3.tar.bz2 +ea686b62f33f0747d07d5612c66ea0a6 frogatto-1.1.tar.bz2 --- frogatto-1.0-Makefile.patch DELETED --- --- frogatto-1.0.3-gcc-4.6.patch DELETED ---