9:01 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv550
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Mar 19 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u2-1
- Updated to 0.148u2
- Switched to the qt debugger and adjusted BR accordingly
- Made it easy to build an svn snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore 11 Feb 2013 23:02:45 -0000 1.70
+++ .cvsignore 19 Mar 2013 21:01:29 -0000 1.71
@@ -1,2 +1,3 @@
mame0148s.exe
0148u1_diff.zip
+0148u2_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mame.spec 11 Feb 2013 23:02:45 -0000 1.81
+++ mame.spec 19 Mar 2013 21:01:30 -0000 1.82
@@ -5,7 +5,12 @@
%bcond_with debug
%global baseversion 148
-%global sourceupdate 1
+%global sourceupdate 2
+#global svn 21418
+
+%if 0%{?svn}
+%global svnrelease .%{svn}svn
+%endif
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -19,18 +24,22 @@
%else
Version: 0.%{baseversion}
%endif
-Release: 1%{?dist}
+
+Release: 1%{?svnrelease}%{?dist}
Summary: Multiple Arcade Machine Emulator
#Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
License: MAME License
URL: http://mamedev.org/
+%if 0%{?svn}
+Source0: %{name}-svn%{svn}.tar.xz
+%else
Source0:
http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
#Source100: whatsnew.zip
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-#Source2: http://mamedev.org/updates/0%{baseversion}u2_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
#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
@@ -39,17 +48,20 @@
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
%endif
+%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
-BuildRequires: GConf2-devel
-BuildRequires: gtk2-devel
%if 0%{?fedora} >= 18
BuildRequires: libjpeg-turbo-devel
%endif
+%if !0%{?svn}
BuildRequires: p7zip
+%endif
+BuildRequires: python
+BuildRequires: qt-devel
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
@@ -141,6 +153,9 @@
%prep
+%if 0%{?svn}
+%setup -qn %{name}-export
+%else
%setup -qcT
for sourcefile in %{sources}; do
7za x $sourcefile
@@ -154,6 +169,7 @@
i=`expr $i + 1`
done
%endif
+%endif
%patch0 -p1 -b .fortify
%patch2 -p1 -b .verbosebuild
@@ -297,7 +313,10 @@
%files
%doc docs/config.txt docs/hlsl.txt docs/license.txt docs/mame.txt
-%doc docs/newvideo.txt docs/nscsi.txt whatsnew*.txt
+%doc docs/newvideo.txt docs/nscsi.txt
+%if !0%{?svn}
+%doc whatsnew*.txt
+%endif
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
%{_sysconfdir}/skel/.%{name}
@@ -334,7 +353,9 @@
%endif
%files -n mess
+%if !0%{?svn}
%doc messnew*.txt
+%endif
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
%{_sysconfdir}/skel/.mess
@@ -362,6 +383,11 @@
%changelog
+* Tue Mar 19 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u2-1
+- Updated to 0.148u2
+- Switched to the qt debugger and adjusted BR accordingly
+- Made it easy to build an svn snapshot
+
* Mon Feb 11 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.148u1-1
- Updated to 0.148u1
- Use system libjpeg on Fedora 18 too (RH bug #854695)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources 11 Feb 2013 23:02:45 -0000 1.70
+++ sources 19 Mar 2013 21:01:30 -0000 1.71
@@ -1,2 +1,3 @@
fec467ec70d727d3dd1c31e3fb687275 mame0148s.exe
01edd53824784f52448f4128f6d52aac 0148u1_diff.zip
+6970189e5cd593dea59aa87579bb4dca 0148u2_diff.zip