Author: belegdol Update of /cvs/nonfree/rpms/bsnes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30456 Modified Files: .cvsignore bsnes-0.037a-strip.patch bsnes-system-zlib.patch bsnes.spec sources Log Message: * Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1 - Updated to 0.047 - Updated the strip patch - Dropped the line endings fix and updated the patches accordingly - Dropped the no longer required profiler fix Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/bsnes/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 May 2009 08:41:42 -0000 1.9 +++ .cvsignore 7 Jun 2009 17:49:18 -0000 1.10 @@ -1 +1 @@ -bsnes_v046.tar.bz2 +bsnes_v047.tar.bz2 bsnes-0.037a-strip.patch: Index: bsnes-0.037a-strip.patch =================================================================== RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes-0.037a-strip.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bsnes-0.037a-strip.patch 11 May 2009 08:41:42 -0000 1.4 +++ bsnes-0.037a-strip.patch 7 Jun 2009 17:49:18 -0000 1.5 @@ -1,11 +1,11 @@ ---- src/Makefile.strip 2009-05-10 02:59:55.000000000 +0200 -+++ src/Makefile 2009-05-10 19:10:41.000000000 +0200 -@@ -8,7 +8,7 @@ - c := $(compiler) - cpp := $(subst cc,++,$(compiler)) - flags := -O3 -fomit-frame-pointer -Ilib --link := -s -+link := +--- src/Makefile.strip 2009-06-07 03:56:29.000000000 +0200 ++++ src/Makefile 2009-06-07 19:38:45.000000000 +0200 +@@ -23,7 +23,7 @@ + ################ - # profile-guided instrumentation: - # flags += -fprofile-generate + ifeq ($(platform),x) +- link += -s ++# link += -s + + ruby := video.glx video.xv video.sdl video.qtimage + ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.ao bsnes-system-zlib.patch: Index: bsnes-system-zlib.patch =================================================================== RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes-system-zlib.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bsnes-system-zlib.patch 11 May 2009 08:41:42 -0000 1.3 +++ bsnes-system-zlib.patch 7 Jun 2009 17:49:18 -0000 1.4 @@ -11,16 +11,16 @@ --- src/lib/libreader/gzreader.hpp.system-zlib 2009-05-02 18:18:10.000000000 +0200 +++ src/lib/libreader/gzreader.hpp 2009-05-10 19:21:27.000000000 +0200 @@ -1,4 +1,4 @@ --#include <zlib/zlib.h> -+#include <zlib.h> - - class GZReader : public Reader { - private: +-#include <zlib/zlib.h> ++#include <zlib.h> + + class GZReader : public Reader { + private: --- src/lib/libreader/zipreader.hpp.system-zlib 2009-05-02 18:18:02.000000000 +0200 +++ src/lib/libreader/zipreader.hpp 2009-05-10 19:22:37.000000000 +0200 @@ -1,4 +1,4 @@ --#include <zlib/unzip.h> -+#include <minizip/unzip.h> - - #define ZIP_MAX_FILE_NAME PATH_MAX - +-#include <zlib/unzip.h> ++#include <minizip/unzip.h> + + #define ZIP_MAX_FILE_NAME PATH_MAX + Index: bsnes.spec =================================================================== RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bsnes.spec 11 May 2009 15:40:25 -0000 1.12 +++ bsnes.spec 7 Jun 2009 17:49:18 -0000 1.13 @@ -1,4 +1,4 @@ -%define vernumber 046 +%define vernumber 047 Name: bsnes Version: 0.%{vernumber} @@ -43,12 +43,9 @@ %patch0 -p0 -b .strip %patch1 -p0 -b .system-zlib -#fix permissions and line endings +#fix permissions find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \; chmod 644 src/data/*.html -find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \; - - #use system optflags sed -i "s#flags := -O3#flags := $RPM_OPT_FLAGS#" src/Makefile @@ -56,8 +53,6 @@ #install fedora-specific readme install -pm 644 %{SOURCE2} README.Fedora -#disable profiling, it breaks i386 build -sed -i "s/flags += -fprofile-use/# flags += -fprofile-use/" src/Makefile %build pushd src @@ -87,6 +82,12 @@ %changelog +* Sun Jun 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.047-1 +- Updated to 0.047 +- Updated the strip patch +- Dropped the line endings fix and updated the patches accordingly +- Dropped the no longer required profiler fix + * Sun May 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.046-1 - Updated to 0.046 - Dropped libXtst-devel BuildRequires Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/bsnes/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 11 May 2009 08:41:42 -0000 1.9 +++ sources 7 Jun 2009 17:49:18 -0000 1.10 @@ -1 +1 @@ -3091093b9ded18e9c9a974079a2d127b bsnes_v046.tar.bz2 +c660eada88b0bfbd1f0fe72d4f57526f bsnes_v047.tar.bz2