rpms/sdlmame/devel .cvsignore, 1.56, 1.57 sdlmame.spec, 1.66, 1.67 sources, 1.57, 1.58

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3655

Modified Files:
	.cvsignore sdlmame.spec sources 
Log Message:
* Fri Sep 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.1.0134u1
- Updated to 0.134u1
- Made the -debug build optional
- Use %global instead of %define



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	11 Sep 2009 08:34:20 -0000	1.56
+++ .cvsignore	27 Sep 2009 15:27:57 -0000	1.57
@@ -1,2 +1,2 @@
 ui.bdc
-sdlmame0134.zip
+sdlmame0134u1.zip


Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sdlmame.spec	11 Sep 2009 08:34:20 -0000	1.66
+++ sdlmame.spec	27 Sep 2009 15:27:57 -0000	1.67
@@ -1,24 +1,27 @@
-#define beta 0133u5
+# the debug build is disabled by default, please use --with debug to override
+%bcond_with debug
+
+%global beta 0134u1
 
 %if "0%{?beta}" != "0"
-%define _version %{?beta}
+%global _version %{?beta}
 %else
-%define _version %{version}
+%global _version %{version}
 %endif
 
 %ifarch x86_64
-%define arch_flags PTR64=1
+%global arch_flags PTR64=1
 %endif
 %ifarch ppc
-%define arch_flags BIGENDIAN=1
+%global arch_flags BIGENDIAN=1
 %endif
 %ifarch ppc64
-%define arch_flags BIGENDIAN=1 PTR64=1
+%global arch_flags BIGENDIAN=1 PTR64=1
 %endif
 
 Name:           sdlmame
-Version:        0134
-Release:        1%{?beta}%{?dist}
+Version:        0135
+Release:        0.1.%{?beta}%{?dist}
 Summary:        SDL Multiple Arcade Machine Emulator
 
 Group:          Applications/Emulators
@@ -65,13 +68,6 @@
 %description tools
 %{summary}.
 
-%package debug
-Summary:        Debug enabled version of sdlmame
-Group:          Applications/Emulators
-
-%description debug
-%{summary}.
-
 %package ldplayer
 Summary:        Standalone laserdisc player based on sdlmame
 Group:          Applications/Emulators
@@ -120,10 +116,13 @@
 %build
 make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
     OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+%if %{with debug}
 make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
     OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+%else
 make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
     OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+%endif
 
 
 %install
@@ -155,8 +154,13 @@
 install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame
 install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps
 install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts
-install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \
-    testkeys %{buildroot}%{_bindir}
+%if %{with debug}
+install -pm 755 mamed %{buildroot}%{_bindir}/mamed
+%else
+install -pm 755 mame %{buildroot}%{_bindir}/mame
+%endif
+install -pm 755 chdman jedutil ldplayer ldresample ldverify romcmp testkeys \
+    %{buildroot}%{_bindir}
 for tool in regrep runtest src2html srcclean
 do
 install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
@@ -172,7 +176,11 @@
 %doc whatsnew*.txt SDLMAME.txt docs/*
 %config(noreplace) %{_sysconfdir}/mame/mame.ini
 %dir %{_sysconfdir}/mame
+%if %{with debug}
+%{_bindir}/mamed
+%else
 %{_bindir}/mame
+%endif
 %{_datadir}/mame
 %{_sysconfdir}/skel/.mame
 
@@ -190,11 +198,6 @@
 %{_bindir}/mame-srcclean
 %{_bindir}/testkeys
 
-%files debug
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/mamed
-
 %files ldplayer
 %defattr(-,root,root,-)
 %doc docs/license.txt
@@ -202,6 +205,11 @@
 
 
 %changelog
+* Fri Sep 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.1.0134u1
+- Updated to 0.134u1
+- Made the -debug build optional
+- Use %%global instead of %%define
+
 * Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
 - Updated to 0.134
 - Turned the ldplayer back on, disabled unidasm instead


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	11 Sep 2009 08:34:20 -0000	1.57
+++ sources	27 Sep 2009 15:27:57 -0000	1.58
@@ -1,2 +1,2 @@
 b64914c2a5589f6d5b00361464152acd  ui.bdc
-706429e5ecf2ed48c1a732d0dc9c0f94  sdlmame0134.zip
+33bda6d296a0d09b78123a6ebe6dba1a  sdlmame0134u1.zip