rpms/mame/devel mame.spec,1.74,1.75

[Julian Sikorski]

Author: belegdol

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

Modified Files:
	mame.spec 
Log Message:
* Sat Oct 27 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147u1-2
- Work around low memory on the RPM Fusion builder



Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mame.spec	8 Oct 2012 17:43:51 -0000	1.74
+++ mame.spec	27 Oct 2012 19:15:52 -0000	1.75
@@ -7,13 +7,16 @@
 %global baseversion 147
 %global sourceupdate 1
 
+#work around low memory on the RPM Fusion builder
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+
 Name:           mame
 %if 0%{?sourceupdate}
 Version:        0.%{baseversion}u%{sourceupdate}
 %else
 Version:        0.%{baseversion}
 %endif
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiple Arcade Machine Emulator
 
 #Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
@@ -175,8 +178,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
@@ -194,12 +196,14 @@
 %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
@@ -344,9 +348,14 @@
 
 
 %changelog
+* Sat Oct 27 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147u1-2
+- Work around low memory on the RPM Fusion builder
+
 * Mon Oct 08 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147u1-1
 - Updated to 0.147u1
 - Dropped missing whatsnew.txt workaround
+- Fixed incorrect paths in mess.ini
+- Remove the object tree between mame and mess builds to prevent mess using /etc/mame
 
 * Fri Sep 21 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.147-1
 - Updated to 0.147