rpms/mame/F-18 .cvsignore, 1.63, 1.64 mame.spec, 1.72, 1.73 sources, 1.63, 1.64

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11299

Modified Files:
	.cvsignore mame.spec sources 
Log Message:
- Reverted to missing 0.147, backporting some changes from devel



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	8 Oct 2012 17:43:56 -0000	1.63
+++ .cvsignore	28 Oct 2012 06:49:55 -0000	1.64
@@ -1,2 +1,2 @@
 mame0147s.exe
-0147u1_diff.zip
+whatsnew_0147.zip


Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mame.spec	8 Oct 2012 17:43:56 -0000	1.72
+++ mame.spec	28 Oct 2012 06:49:55 -0000	1.73
@@ -5,7 +5,13 @@
 %bcond_with debug
 
 %global baseversion 147
-%global sourceupdate 1
+%global sourceupdate 0
+
+# work around low memory on the RPM Fusion builder
+%bcond_without lowmem
+%if %{with lowmem}
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
 
 Name:           mame
 %if 0%{?sourceupdate}
@@ -20,9 +26,11 @@
 License:        MAME License
 URL:            http://mamedev.org/
 Source0:        http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
+#Get from http://mamedev.org/releases/whatsnew_0%{baseversion}.txt and compress
+Source100:      whatsnew_0%{baseversion}.zip
 %if 0%{?sourceupdate}
 #Source updates
-Source1:        http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+#Source1:        http://mamedev.org/updates/0%{baseversion}u1_diff.zip
 #Source2:        http://mamedev.org/updates/0%{baseversion}u2_diff.zip
 #Source3:        http://mamedev.org/updates/0%{baseversion}u3_diff.zip
 #Source4:        http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -39,13 +47,17 @@
 BuildRequires:  flac-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  gtk2-devel
-# BuildRequires:  libjpeg-devel
+%if 0%{?fedora} >= 19
+BuildRequires:  libjpeg-devel
+%endif
 BuildRequires:  p7zip
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  zlib-devel
 Requires:       %{name}-data = %{version}-%{release}
 
+%if 0%{?fedora} < 19
 Provides:       bundled(libjpeg) = 8c
+%endif
 Provides:       bundled(lzma-sdk) = 9.22
 
 %description
@@ -85,7 +97,9 @@
 Summary:        Multi Emulator Super System
 Requires:       mess-data = %{version}-%{release}
 
+%if 0%{?fedora} < 19
 Provides:       bundled(libjpeg) = 8c
+%endif
 Provides:       bundled(lzma-sdk) = 9.22
 
 %description -n mess
@@ -129,10 +143,10 @@
 
 %prep
 %setup -qcT
+install -pm 644 %{SOURCE100} .
 for sourcefile in %{sources}; do
     7za x $sourcefile
 done
-sed -i '2157d' src/mess/mess.mak
 find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
 %if 0%{?sourceupdate}
 i=1
@@ -175,8 +189,7 @@
 EOF
 
 #make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
 
 
 %build
@@ -185,7 +198,13 @@
 
 #save some space
 MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
-    BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+    BUILD_FLAC=0 SUFFIX64="
+
+%if 0%{?fedora} >= 19
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
+%else
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
+%endif
 
 %if %{with ldplayer}
 make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -194,13 +213,13 @@
 %if %{with debug}
 make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
     OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+rm -rf obj
 make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
     OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
 %else
 make %{?_smp_mflags} $MAME_FLAGS \
     OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+rm -rf obj
 make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
     OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
 %endif
@@ -344,11 +363,7 @@
 
 
 %changelog
-* Mon Oct 08 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147u1-1
-- Updated to 0.147u1
-- Dropped missing whatsnew.txt workaround
-
-* Fri Sep 21 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147-1
+* Sun Oct 28 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147-1
 - Updated to 0.147
 - Merged with mess
 - Streamlined the directories installation
@@ -356,6 +371,8 @@
 - Fixed mame.6 installation location
 - Re-enabled ldplayer
 - Cleaned-up ancient Obsoletes/Provides
+- Worked around low memory on the RPM Fusion builder
+- Use system libjpeg-turbo on Fedora 19 and above
 
 * Mon Aug 20 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.146u5-1
 - Updated to 0.146u5


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	8 Oct 2012 17:43:56 -0000	1.63
+++ sources	28 Oct 2012 06:49:55 -0000	1.64
@@ -1,2 +1,2 @@
 02b38e27f0840bbd0b637385f16f3747  mame0147s.exe
-7f2dbea383138a6ae2bbaac3b32376d6  0147u1_diff.zip
+0b4bec8581c6cfaa3e0ac75d7d575fa9  whatsnew_0147.zip