Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31855
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Mon Dec 17 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u4-1
- Updated to 0.147u4
- Updated the lowmem workaround - the linker is not the culprit, dwz is
- BR: libjpeg-devel → libjpeg-turbo-devel
- Updated the verbosebuild patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore 19 Nov 2012 22:41:52 -0000 1.67
+++ .cvsignore 17 Dec 2012 20:58:44 -0000 1.68
@@ -2,3 +2,4 @@
0147u1_diff.zip
0147u2_diff.zip
0147u3_diff.zip
+0147u4_diff.zip
mame-verbosebuild.patch:
makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame-verbosebuild.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mame-verbosebuild.patch 19 Apr 2011 19:35:38 -0000 1.4
+++ mame-verbosebuild.patch 17 Dec 2012 20:58:44 -0000 1.5
@@ -1,7 +1,7 @@
-diff -up mame-0.142u1/makefile.verbosebuild mame-0.142u1/makefile
---- mame-0.142u1/makefile.verbosebuild 2011-04-19 21:29:01.000000000 +0200
-+++ mame-0.142u1/makefile 2011-04-19 21:31:40.000000000 +0200
-@@ -297,12 +297,12 @@ BUILD_EXE = $(EXE)
+diff -up mame-0.147u4/makefile.verbosebuild mame-0.147u4/makefile
+--- mame-0.147u4/makefile.verbosebuild 2012-12-17 21:53:58.176154755 +0100
++++ mame-0.147u4/makefile 2012-12-17 21:55:26.559977075 +0100
+@@ -307,13 +307,13 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@@ -14,12 +14,14 @@
MD = -mkdir$(EXE)
-RM = @rm -f
-OBJDUMP = @objdump
+-PYTHON = @python
+RM = rm -f
+OBJDUMP = objdump
++PYTHON = python
-
-@@ -755,12 +755,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+ #-------------------------------------------------
+@@ -786,12 +786,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mame.spec 24 Nov 2012 14:02:57 -0000 1.78
+++ mame.spec 17 Dec 2012 20:58:44 -0000 1.79
@@ -5,12 +5,11 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 3
+%global sourceupdate 4
# 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
%global _find_debuginfo_dwz_opts %{nil}
%endif
@@ -32,7 +31,7 @@
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
+Source4:
http://mamedev.org/updates/0%{baseversion}u4_diff.zip
#Source5:
http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6:
http://mamedev.org/updates/0%{baseversion}u6_diff.zip
#Source7:
http://mamedev.org/updates/0%{baseversion}u7_diff.zip
@@ -47,7 +46,7 @@
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
%if 0%{?fedora} >= 19
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo-devel
%endif
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
@@ -362,6 +361,12 @@
%changelog
+* Mon Dec 17 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u4-1
+- Updated to 0.147u4
+- Updated the lowmem workaround - the linker is not the culprit, dwz is
+- BR: libjpeg-devel → libjpeg-turbo-devel
+- Updated the verbosebuild patch
+
* Mon Nov 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u3-1
- Updated to 0.147u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources 19 Nov 2012 22:41:52 -0000 1.67
+++ sources 17 Dec 2012 20:58:44 -0000 1.68
@@ -2,3 +2,4 @@
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
8851533ae3f692e436bc399b773c4fcb 0147u3_diff.zip
+3d5fc211f98454f857e58f9100d09e19 0147u4_diff.zip