rpms/frogatto/devel .cvsignore, 1.6, 1.7 frogatto-1.2-Makefile.patch, 1.1, 1.2 frogatto.spec, 1.10, 1.11 sources, 1.6, 1.7 frogatto-1.0.3-yugiohjcj.patch, 1.1, NONE

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/nonfree/rpms/frogatto/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17662

Modified Files:
	.cvsignore frogatto-1.2-Makefile.patch frogatto.spec sources 
Removed Files:
	frogatto-1.0.3-yugiohjcj.patch 
Log Message:
* Mon Apr  8 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.3.1-1
- Rebase to upstream 1.3.1 release
- Rebuild for new boost and glew



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	25 Dec 2011 19:46:10 -0000	1.6
+++ .cvsignore	8 Apr 2013 10:25:26 -0000	1.7
@@ -1 +1 @@
-frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+1.3.1.tar.gz

frogatto-1.2-Makefile.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: frogatto-1.2-Makefile.patch
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto-1.2-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frogatto-1.2-Makefile.patch	25 Dec 2011 19:46:10 -0000	1.1
+++ frogatto-1.2-Makefile.patch	8 Apr 2013 10:25:26 -0000	1.2
@@ -1,16 +1,12 @@
-diff -durN frogatto-frogatto-64c84bf.orig/Makefile frogatto-frogatto-64c84bf/Makefile
---- frogatto-frogatto-64c84bf.orig/Makefile	2011-11-30 06:31:31.000000000 +0100
-+++ frogatto-frogatto-64c84bf/Makefile	2011-12-25 16:49:42.639667432 +0100
-@@ -9,10 +9,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 $<
+diff -up frogatto-1.3.1/Makefile~ frogatto-1.3.1/Makefile
+--- frogatto-1.3.1/Makefile~	2012-12-08 23:36:13.000000000 +0100
++++ frogatto-1.3.1/Makefile	2013-04-08 09:50:59.035587574 +0200
+@@ -40,7 +40,7 @@ BASE_CXXFLAGS += -g -fno-inline-function
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
  
- game: $(objects)
--	$(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -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
-+	$(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -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
+ # Linker library options.
+-LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
++LIBS := $(shell pkg-config --libs x11 ) \
+ 	$(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
  
- server: $(server_objects)
--	$(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -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
-+	$(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -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
- 
- formula_test: $(formula_test_objects)
- 	$(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex
+ include Makefile.common


Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- frogatto.spec	1 Nov 2012 19:28:22 -0000	1.10
+++ frogatto.spec	8 Apr 2013 10:25:26 -0000	1.11
@@ -1,26 +1,19 @@
 Name:           frogatto
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        An old-school 2D platform game
 
 Group:          Amusements/Games
 # Artwork and music not released under an open license
 License:        GPLv3+ and proprietary
 URL:            http://www.frogatto.com/
-# You can get this tarball from:
-# https://github.com/frogatto/frogatto/tarball/1.2
-Source0:        frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+Source0:        https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
 Source1:        %{name}.sh
 Source2:        %{name}.desktop
 Source3:        %{name}.xpm
 Source4:        %{name}.pod
 # Patch Makefile not to link lSDLmain
 Patch0:         %{name}-1.2-Makefile.patch
-# Add joystick support for
-# Microsoft X-Box 360 pad and Microsoft SideWinder Game Pad USB
-# http://yugiohjcj.1s.fr/
-Patch1:         %{name}-1.0.3-yugiohjcj.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.7
 BuildRequires:  SDL_image-devel
@@ -47,21 +40,19 @@
 
 
 %prep
-%setup -q -n %{name}-%{name}-64c84bf
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 # Fix locale file path
 sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
 
 
 %build
-make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags} \
+  BASE_CXXFLAGS="$RPM_OPT_FLAGS -fno-inline-functions -fthreadsafe-statics"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Install wrapper script
 install -d %{buildroot}%{_bindir}
 install -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
@@ -69,13 +60,15 @@
 # Install game and data
 install -d %{buildroot}%{_libexecdir}/%{name}
 install -m 755 -p game %{buildroot}%{_libexecdir}/%{name}
-install -d %{buildroot}%{_datadir}/%{name}
-cp -pr data images music sounds \
+install -d %{buildroot}%{_datadir}/%{name}/modules/%{name}
+cp -pr data images music *.cfg \
   %{buildroot}%{_datadir}/%{name}
-
-# Install translations
-install -d %{buildroot}%{_datadir}/locale
-cp -pr locale %{buildroot}%{_datadir}
+pushd modules/%{name}
+cp -pr data images music sounds *.cfg \
+  %{buildroot}%{_datadir}/%{name}/modules/%{name}
+  # Install translations
+  cp -pr locale %{buildroot}%{_datadir}
+popd
 
 # Install desktop file
 install -d %{buildroot}%{_datadir}/applications
@@ -98,10 +91,6 @@
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -118,17 +107,20 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%doc modules/%{name}/CHANGELOG LICENSE
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_libexecdir}/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 %{_datadir}/applications/%{name}.desktop
 %{_mandir}/man6/%{name}.6*
-%doc CHANGELOG LICENSE
 
 
 %changelog
+* Mon Apr  8 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.3.1-1
+- Rebase to upstream 1.3.1 release
+- Rebuild for new boost and glew
+
 * Thu Nov 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.2-4
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Dec 2011 19:46:10 -0000	1.6
+++ sources	8 Apr 2013 10:25:26 -0000	1.7
@@ -1 +1 @@
-b60924f384e04728eb6e76cdd48ab8f9  frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+f3206fbe1395ea2878092fbd4ed2c591  1.3.1.tar.gz


--- frogatto-1.0.3-yugiohjcj.patch DELETED ---