5:22 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30890
Modified Files:
.cvsignore mess-verbosebuild.patch mess.spec sources
Log Message:
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143-1
- Updated to 0.143
- Updated the verbosebuild patch
- MAME source is not needed anymore
- Dropped p7zip from BuildRequires
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Apr 2011 19:45:28 -0000 1.6
+++ .cvsignore 29 Jun 2011 17:22:22 -0000 1.7
@@ -1,3 +1,2 @@
ctrlr.rar
-mame0142s.exe
-mess0142s.zip
+mess0143s.zip
mess-verbosebuild.patch:
makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: mess-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/mess-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mess-verbosebuild.patch 1 Nov 2010 22:20:54 -0000 1.3
+++ mess-verbosebuild.patch 29 Jun 2011 17:22:22 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up mame-0.139u3/makefile.verbosebuild mame-0.139u3/makefile
---- mame-0.139u3/makefile.verbosebuild 2010-09-19 17:03:31.000000000 +0200
-+++ mame-0.139u3/makefile 2010-09-19 17:12:14.000000000 +0200
-@@ -294,12 +294,12 @@ BUILD_EXE = $(EXE)
+diff -up mess-0.143/makefile.verbosebuild mess-0.143/makefile
+--- mess-0.143/makefile.verbosebuild 2011-06-29 18:37:48.905676677 +0200
++++ mess-0.143/makefile 2011-06-29 18:40:27.154888332 +0200
+@@ -297,12 +297,12 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@@ -19,7 +19,7 @@
-@@ -745,12 +745,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+@@ -752,12 +752,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
@@ -33,5 +33,5 @@
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
- $(OBJ)/%.a:
- @echo Archiving $@...
+ $(DRIVLISTOBJ): $(DRIVLISTSRC)
+ @echo Compiling $<...
Index: mess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/mess.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mess.spec 4 Apr 2011 21:11:30 -0000 1.6
+++ mess.spec 29 Jun 2011 17:22:22 -0000 1.7
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 142
+%global baseversion 143
#global snapshot 1
Name: mess
@@ -16,10 +16,11 @@
%if 0%{?snapshot}
Source0: mess-snapshot.tar.xz
%else
-Source0: http://www.aarongiles.com/mirror/releases/mame0%{baseversion}s.exe
-Source1: http://www.mess.org/files/%{name}0%{baseversion}s.zip
+#Available here:
+#http://mess.redump.net/downloads
+Source0: %{name}0%{baseversion}s.zip
%endif
-Source2: ctrlr.rar
+Source1: ctrlr.rar
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +28,6 @@
BuildRequires: expat-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
-BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: unrar
BuildRequires: zlib-devel
@@ -72,12 +72,9 @@
%if 0%{?snapshot}
%setup -qn %{name}
%else
-%setup -qcT
-7za x %{SOURCE0}
-#mess does not need mame hash files
-rm -rf hash
-find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
-unzip -o %{SOURCE1}
+%setup -qc
+# Fix end-of-line encoding, but don't ruin binary files
+find . -type f -not -name \*.png -not -name \*.zip -exec sed -i 's/\r//' {} \;
%endif
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
@@ -88,16 +85,9 @@
# Move the imgtool documentation to the top dir for better visibility
mv docs/imgtool.txt .
-# Fix permissions
-chmod 644 docs/config.txt docs/credits.htm docs/license.txt docs/mame.txt
docs/newvideo.txt
-find src/mess -type f \( -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
-chmod 644 src/mame/machine/snescx4.h
-
-# Fix newvideo.txt encoding
-pushd docs
-/usr/bin/iconv -f cp1250 -t utf-8 newvideo.txt > newvideo.txt.conv
-/bin/mv -f newvideo.txt.conv newvideo.txt
-popd
+# Fix whatsnew.txt encoding
+/usr/bin/iconv -f iso8859-1 -t utf-8 whatsnew.txt > whatsnew.txt.conv
+/bin/mv -f whatsnew.txt.conv whatsnew.txt
# Create ini file
cat > %{name}.ini << EOF
@@ -179,7 +169,7 @@
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
# Install controller files
-unrar x %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}
+unrar x %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
@@ -223,6 +213,12 @@
%changelog
+* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143-1
+- Updated to 0.143
+- Updated the verbosebuild patch
+- MAME source is not needed anymore
+- Dropped p7zip from BuildRequires
+
* Mon Apr 04 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142-1
- Updated to 0.142
- Provided an easy way to build a SVN snapshot
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Apr 2011 19:45:28 -0000 1.6
+++ sources 29 Jun 2011 17:22:22 -0000 1.7
@@ -1,3 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-56fa8befc6bc768906e4235ba906453c mame0142s.exe
-fecff43a5380267bcedba135581682a5 mess0142s.zip
+29256f4244daea3e239151d94c0d9969 mess0143s.zip