Author: belegdol Update of /cvs/nonfree/rpms/sdlmame/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24672 Modified Files: .cvsignore sdlmame.spec sources Log Message: * Thu Feb 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.5.0129u5 - Updated to 0.129u4 - Use macros consistently - Fixed whatsnew.txt encoding Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 17 Feb 2009 19:11:34 -0000 1.32 +++ .cvsignore 26 Feb 2009 16:22:31 -0000 1.33 @@ -1,2 +1,2 @@ ui.bdc -sdlmame0129u4.zip +sdlmame0129u5.zip Index: sdlmame.spec =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sdlmame.spec 17 Feb 2009 20:52:19 -0000 1.38 +++ sdlmame.spec 26 Feb 2009 16:22:32 -0000 1.39 @@ -1,4 +1,4 @@ -%define beta 0129u4 +%define beta 0129u5 %if "0%{?beta}" != "0" %define _version %{?beta} @@ -18,7 +18,7 @@ Name: sdlmame Version: 0130 -Release: 0.4.%{?beta}%{?dist} +Release: 0.5.%{?beta}%{?dist} Summary: SDL Multiple Arcade Machine Emulator Group: Applications/Emulators @@ -31,10 +31,11 @@ Patch1: %{name}-expat.patch Patch2: %{name}-bne.patch Patch3: %{name}-fortify.patch +Patch4: sdlmame-0.129u4-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel -BuildRequires: GConf2-devel dbus-devel +BuildRequires: GConf2-devel %description MAME stands for Multiple Arcade Machine Emulator. When used in conjunction @@ -83,6 +84,7 @@ %patch1 -p0 -b .expat~ %patch2 -p0 -b .bne~ %patch3 -p0 -b .fortify +%patch4 -p0 -b .gcc44 # Create mame.ini file cat > mame.ini << EOF @@ -116,6 +118,10 @@ # Fix end-of-line encoding sed -i 's/\r//' whatsnew.txt +#Fix whatsnew.txt encoding +/usr/bin/iconv -f iso8859-1 -t utf-8 whatsnew.txt > whatsnew.txt.conv +/bin/mv -f whatsnew.txt.conv whatsnew.txt + #Fix newvideo.txt encoding pushd docs /usr/bin/iconv -f cp1250 -t utf-8 newvideo.txt > newvideo.txt.conv @@ -125,11 +131,11 @@ %build make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' + OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""' make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' + OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""' make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' + OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""' %install @@ -208,8 +214,14 @@ %changelog +* Thu Feb 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.5.0129u5 +- Updated to 0.129u4 +- Use macros consistently +- Fixed whatsnew.txt encoding + * Tue Feb 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.4.0129u4 - Updated to 0.129u4 +- Fixed building with gcc-4.4 * Fri Jan 30 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.3.0129u3 - Updated to 0.129u3 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 17 Feb 2009 19:11:34 -0000 1.33 +++ sources 26 Feb 2009 16:22:32 -0000 1.34 @@ -1,2 +1,2 @@ b64914c2a5589f6d5b00361464152acd ui.bdc -34bb7f4fbfd0e3e90238e6d31adc0e01 sdlmame0129u4.zip +7921149ca826ba6e8e9f5435e3042b61 sdlmame0129u5.zip