rpms/mame/devel .cvsignore, 1.3, 1.4 mame.spec, 1.2, 1.3 sources, 1.3, 1.4 mame-ppc64.patch, 1.1, NONE
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31226
Modified Files:
.cvsignore mame.spec sources
Removed Files:
mame-ppc64.patch
Log Message:
* Thu Apr 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.137u3-1
- Updated to 0137u3
- Dropped upstreamed ppc64 patch
- Moved rpm patches application after upstream ones
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Apr 2010 22:48:00 -0000 1.3
+++ .cvsignore 22 Apr 2010 19:14:01 -0000 1.4
@@ -1,3 +1,4 @@
mame0137s.exe
0137u1_diff.zip
0137u2_diff.zip
+0137u3_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mame.spec 8 Apr 2010 22:48:00 -0000 1.2
+++ mame.spec 22 Apr 2010 19:14:01 -0000 1.3
@@ -2,7 +2,7 @@
%bcond_with debug
%global baseversion 137
-%global sourceupdate 2
+%global sourceupdate 3
Name: mame
%if 0%{?sourceupdate}
@@ -24,9 +24,9 @@
#Source updates
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
%endif
Patch0: %{name}-fortify.patch
-Patch1: %{name}-ppc64.patch
Patch2: %{name}-verbosebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,9 +86,6 @@
7za x $sourcefile
done
find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
-%patch0 -p1 -b .fortify
-%patch1 -p1 -b .ppc64
-%patch2 -p1 -b .verbosebuild
%if 0%{?sourceupdate}
i=1
while [ $i -le %{sourceupdate} ]; do
@@ -96,6 +93,8 @@
i=`expr $i + 1`
done
%endif
+%patch0 -p1 -b .fortify
+%patch2 -p1 -b .verbosebuild
# Create ini file
cat > %{name}.ini << EOF
@@ -220,6 +219,11 @@
%changelog
+* Thu Apr 22 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.137u3-1
+- Updated to 0137u3
+- Dropped upstreamed ppc64 patch
+- Moved rpm patches application after upstream ones
+
* Fri Apr 09 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.137u2-1
- Updated to 0137u2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Apr 2010 22:48:00 -0000 1.3
+++ sources 22 Apr 2010 19:14:01 -0000 1.4
@@ -1,3 +1,4 @@
1b70adfbe6aa35959881b82e48f93d82 mame0137s.exe
12c116ebdcb322a9149faa03a9b747b8 0137u1_diff.zip
e3f30998a26192fb37cba6021261c9d7 0137u2_diff.zip
+e186be6daa599adc2196cf2292b9d881 0137u3_diff.zip
--- mame-ppc64.patch DELETED ---