rpms/mplayer/F-15 mplayer-pause.patch, NONE, 1.1 mplayer.spec, 1.37, 1.38
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12549
Modified Files:
mplayer.spec
Added Files:
mplayer-pause.patch
Log Message:
Fix https://bugzilla.rpmfusion.org/show_bug.cgi?id=1703
mplayer-pause.patch:
mplayer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mplayer-pause.patch ---
commit b2dce9463216e55484918caa553604b44dfd3f11
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri Apr 15 20:41:40 2011 +0000
Avoid crash when pausing an audio-only file.
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33268 b3059339-0415-0410-9bf9-f77b7e298cf2
diff --git a/mplayer.c b/mplayer.c
index 22d3baf..c946b4a 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2539,7 +2539,8 @@ static void pause_loop(void)
}
}
#endif
- handle_udp_master(mpctx->sh_video->pts);
+ if (mpctx->sh_video)
+ handle_udp_master(mpctx->sh_video->pts);
usec_sleep(20000);
}
if (cmd && cmd->id == MP_CMD_PAUSE) {
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mplayer.spec 12 Apr 2011 16:33:04 -0000 1.37
+++ mplayer.spec 29 Jun 2011 19:40:06 -0000 1.38
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.123.%{pre}%{?dist}
+Release: 0.124.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -32,6 +32,8 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
+# Upstream fix for http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1904
+Patch19: %{name}-pause.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -230,6 +232,7 @@
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
+%patch19 -p1 -b .pause
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -402,6 +405,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Thu Jun 16 2011 Ricky Zhou <ricky(a)rzhou.org> - 1.0-0.124.20110412svn
+- Add upstream patch for pause crash.
+
* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
- 20110412 snapshot
- drop obsolete libvorbis patch
13 years, 4 months
rpms/mplayer/devel mplayer-pause.patch, NONE, 1.1 mplayer.spec, 1.37, 1.38
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12130
Modified Files:
mplayer.spec
Added Files:
mplayer-pause.patch
Log Message:
Fix https://bugzilla.rpmfusion.org/show_bug.cgi?id=1703
mplayer-pause.patch:
mplayer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mplayer-pause.patch ---
commit b2dce9463216e55484918caa553604b44dfd3f11
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri Apr 15 20:41:40 2011 +0000
Avoid crash when pausing an audio-only file.
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33268 b3059339-0415-0410-9bf9-f77b7e298cf2
diff --git a/mplayer.c b/mplayer.c
index 22d3baf..c946b4a 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2539,7 +2539,8 @@ static void pause_loop(void)
}
}
#endif
- handle_udp_master(mpctx->sh_video->pts);
+ if (mpctx->sh_video)
+ handle_udp_master(mpctx->sh_video->pts);
usec_sleep(20000);
}
if (cmd && cmd->id == MP_CMD_PAUSE) {
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mplayer.spec 12 Apr 2011 16:33:04 -0000 1.37
+++ mplayer.spec 29 Jun 2011 19:38:28 -0000 1.38
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.123.%{pre}%{?dist}
+Release: 0.124.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -32,6 +32,8 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
+# Upstream fix for http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1904
+Patch19: %{name}-pause.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -230,6 +232,7 @@
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
+%patch19 -p1 -b .pause
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -402,6 +405,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Thu Jun 16 2011 Ricky Zhou <ricky(a)rzhou.org> - 1.0-0.124.20110412svn
+- Add upstream patch for pause crash.
+
* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
- 20110412 snapshot
- drop obsolete libvorbis patch
13 years, 4 months
rpms/mess/F-13 .cvsignore, 1.6, 1.7 mess-verbosebuild.patch, 1.3, 1.4 mess.spec, 1.6, 1.7 sources, 1.6, 1.7
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31347
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/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Apr 2011 19:45:46 -0000 1.6
+++ .cvsignore 29 Jun 2011 17:23:13 -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/F-13/mess-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mess-verbosebuild.patch 2 Nov 2010 07:25:15 -0000 1.3
+++ mess-verbosebuild.patch 29 Jun 2011 17:23:13 -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/F-13/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:23:14 -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/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Apr 2011 19:45:47 -0000 1.6
+++ sources 29 Jun 2011 17:23:14 -0000 1.7
@@ -1,3 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-56fa8befc6bc768906e4235ba906453c mame0142s.exe
-fecff43a5380267bcedba135581682a5 mess0142s.zip
+29256f4244daea3e239151d94c0d9969 mess0143s.zip
13 years, 4 months
rpms/mess/F-14 .cvsignore, 1.6, 1.7 mess-verbosebuild.patch, 1.3, 1.4 mess.spec, 1.6, 1.7 sources, 1.6, 1.7
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31110
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/F-14/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Apr 2011 19:45:38 -0000 1.6
+++ .cvsignore 29 Jun 2011 17:23:01 -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/F-14/mess-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mess-verbosebuild.patch 2 Nov 2010 07:25:10 -0000 1.3
+++ mess-verbosebuild.patch 29 Jun 2011 17:23:01 -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/F-14/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:23:01 -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/F-14/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Apr 2011 19:45:38 -0000 1.6
+++ sources 29 Jun 2011 17:23:01 -0000 1.7
@@ -1,3 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-56fa8befc6bc768906e4235ba906453c mame0142s.exe
-fecff43a5380267bcedba135581682a5 mess0142s.zip
+29256f4244daea3e239151d94c0d9969 mess0143s.zip
13 years, 4 months
rpms/mess/F-15 .cvsignore, 1.6, 1.7 mess-verbosebuild.patch, 1.3, 1.4 mess.spec, 1.6, 1.7 sources, 1.6, 1.7
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31003
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/F-15/.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:37 -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/F-15/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:37 -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/F-15/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:37 -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/F-15/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:37 -0000 1.7
@@ -1,3 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-56fa8befc6bc768906e4235ba906453c mame0142s.exe
-fecff43a5380267bcedba135581682a5 mess0142s.zip
+29256f4244daea3e239151d94c0d9969 mess0143s.zip
13 years, 4 months
rpms/mess/devel .cvsignore, 1.6, 1.7 mess-verbosebuild.patch, 1.3, 1.4 mess.spec, 1.6, 1.7 sources, 1.6, 1.7
by Julian Sikorski
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
13 years, 4 months
rpms/qmc2/F-13 .cvsignore, 1.19, 1.20 qmc2-ini.patch, 1.7, 1.8 qmc2.spec, 1.30, 1.31 sources, 1.19, 1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30302
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
- Updated to 0.2b20
- Updated the ini patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-13/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 3 Apr 2011 17:56:27 -0000 1.19
+++ .cvsignore 29 Jun 2011 17:14:35 -0000 1.20
@@ -1 +1 @@
-qmc2-0.2.b19.tar.bz2
+qmc2-0.2.b20.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-13/qmc2-ini.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmc2-ini.patch 16 May 2010 10:30:24 -0000 1.7
+++ qmc2-ini.patch 29 Jun 2011 17:14:35 -0000 1.8
@@ -1,71 +1,11 @@
diff -up qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini qmc2-0.2/sdlmame/inst/qmc2.ini.template
---- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2011-05-24 08:42:43.000000000 +0200
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2011-06-06 00:02:16.853946910 +0200
+@@ -1,8 +1,24 @@
+ [Frontend]
+ qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmame\Gamelist\UseCatverIni=true
qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-
- [MAME]
-+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
-+Configuration\Global\samplepath=DATADIR/mame/samples
-+Configuration\Global\artpath="DATADIR/mame/artwork;DATADIR/mame/effects"
-+Configuration\Global\cheat_file=DATADIR/mame/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mame/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mame/cfg
-+Configuration\Global\comment_directory=$HOME/.mame/comments
-+Configuration\Global\diff_directory=$HOME/.mame/diff
-+Configuration\Global\inipath="$HOME/.mame/ini;/etc/mame"
-+Configuration\Global\input_directory=$HOME/.mame/inp
-+Configuration\Global\memcard_directory=$HOME/.mame/memcard
-+Configuration\Global\nvram_directory=$HOME/.mame/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mame/snap
-+Configuration\Global\state_directory=$HOME/.mame/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mame
-+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
-+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
-
- [MESS]
-+Configuration\Global\rompath="DATADIR/mess/roms;DATADIR/mess/chds"
-+Configuration\Global\samplepath=DATADIR/mess/samples
-+Configuration\Global\artpath="DATADIR/mess/artwork;DATADIR/mess/effects"
-+Configuration\Global\cheat_file=DATADIR/mess/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mess/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mess/cfg
-+Configuration\Global\comment_directory=$HOME/.mess/comments
-+Configuration\Global\diff_directory=$HOME/.mess/diff
-+Configuration\Global\inipath="$HOME/.mess/ini;/etc/mess"
-+Configuration\Global\input_directory=$HOME/.mess/inp
-+Configuration\Global\memcard_directory=$HOME/.mess/memcard
-+Configuration\Global\nvram_directory=$HOME/.mess/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mess/snap
-+Configuration\Global\state_directory=$HOME/.mess/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
-diff -up qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini qmc2-0.2/sdlmess/inst/qmc2.ini.template
---- qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmess/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-+qmc2-sdlmame\Gamelist\UseCatverIni=true
- qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -84,6 +24,12 @@
+Configuration\Global\state_directory=$HOME/.mame/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -12,8 +28,27 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mame
+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
@@ -106,5 +52,11 @@
+Configuration\Global\state_directory=$HOME/.mess/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -23,3 +58,5 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-13/qmc2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- qmc2.spec 3 Apr 2011 17:56:27 -0000 1.30
+++ qmc2.spec 29 Jun 2011 17:14:35 -0000 1.31
@@ -1,8 +1,8 @@
-%define beta b19
+%define beta b20
Name: qmc2
Version: 0.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
@@ -131,6 +131,10 @@
%changelog
+* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
+- Updated to 0.2b20
+- Updated the ini patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.23.b19
- Updated to 0.2b19
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 3 Apr 2011 17:56:27 -0000 1.19
+++ sources 29 Jun 2011 17:14:35 -0000 1.20
@@ -1 +1 @@
-b9cae829540066d21154e474b24ccc62 qmc2-0.2.b19.tar.bz2
+e868144815ff44a2146e839c2395c6d1 qmc2-0.2.b20.tar.bz2
13 years, 4 months
rpms/qmc2/F-14 .cvsignore, 1.19, 1.20 qmc2-ini.patch, 1.7, 1.8 qmc2.spec, 1.30, 1.31 sources, 1.19, 1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29917
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
- Updated to 0.2b20
- Updated the ini patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-14/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 3 Apr 2011 17:56:17 -0000 1.19
+++ .cvsignore 29 Jun 2011 17:14:25 -0000 1.20
@@ -1 +1 @@
-qmc2-0.2.b19.tar.bz2
+qmc2-0.2.b20.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-14/qmc2-ini.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmc2-ini.patch 16 May 2010 10:30:02 -0000 1.7
+++ qmc2-ini.patch 29 Jun 2011 17:14:25 -0000 1.8
@@ -1,71 +1,11 @@
diff -up qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini qmc2-0.2/sdlmame/inst/qmc2.ini.template
---- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2011-05-24 08:42:43.000000000 +0200
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2011-06-06 00:02:16.853946910 +0200
+@@ -1,8 +1,24 @@
+ [Frontend]
+ qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmame\Gamelist\UseCatverIni=true
qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-
- [MAME]
-+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
-+Configuration\Global\samplepath=DATADIR/mame/samples
-+Configuration\Global\artpath="DATADIR/mame/artwork;DATADIR/mame/effects"
-+Configuration\Global\cheat_file=DATADIR/mame/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mame/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mame/cfg
-+Configuration\Global\comment_directory=$HOME/.mame/comments
-+Configuration\Global\diff_directory=$HOME/.mame/diff
-+Configuration\Global\inipath="$HOME/.mame/ini;/etc/mame"
-+Configuration\Global\input_directory=$HOME/.mame/inp
-+Configuration\Global\memcard_directory=$HOME/.mame/memcard
-+Configuration\Global\nvram_directory=$HOME/.mame/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mame/snap
-+Configuration\Global\state_directory=$HOME/.mame/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mame
-+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
-+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
-
- [MESS]
-+Configuration\Global\rompath="DATADIR/mess/roms;DATADIR/mess/chds"
-+Configuration\Global\samplepath=DATADIR/mess/samples
-+Configuration\Global\artpath="DATADIR/mess/artwork;DATADIR/mess/effects"
-+Configuration\Global\cheat_file=DATADIR/mess/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mess/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mess/cfg
-+Configuration\Global\comment_directory=$HOME/.mess/comments
-+Configuration\Global\diff_directory=$HOME/.mess/diff
-+Configuration\Global\inipath="$HOME/.mess/ini;/etc/mess"
-+Configuration\Global\input_directory=$HOME/.mess/inp
-+Configuration\Global\memcard_directory=$HOME/.mess/memcard
-+Configuration\Global\nvram_directory=$HOME/.mess/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mess/snap
-+Configuration\Global\state_directory=$HOME/.mess/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
-diff -up qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini qmc2-0.2/sdlmess/inst/qmc2.ini.template
---- qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmess/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-+qmc2-sdlmame\Gamelist\UseCatverIni=true
- qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -84,6 +24,12 @@
+Configuration\Global\state_directory=$HOME/.mame/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -12,8 +28,27 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mame
+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
@@ -106,5 +52,11 @@
+Configuration\Global\state_directory=$HOME/.mess/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -23,3 +58,5 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-14/qmc2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- qmc2.spec 3 Apr 2011 17:56:17 -0000 1.30
+++ qmc2.spec 29 Jun 2011 17:14:25 -0000 1.31
@@ -1,8 +1,8 @@
-%define beta b19
+%define beta b20
Name: qmc2
Version: 0.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
@@ -131,6 +131,10 @@
%changelog
+* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
+- Updated to 0.2b20
+- Updated the ini patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.23.b19
- Updated to 0.2b19
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-14/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 3 Apr 2011 17:56:17 -0000 1.19
+++ sources 29 Jun 2011 17:14:25 -0000 1.20
@@ -1 +1 @@
-b9cae829540066d21154e474b24ccc62 qmc2-0.2.b19.tar.bz2
+e868144815ff44a2146e839c2395c6d1 qmc2-0.2.b20.tar.bz2
13 years, 4 months
rpms/qmc2/F-15 .cvsignore, 1.19, 1.20 qmc2-ini.patch, 1.7, 1.8 qmc2.spec, 1.31, 1.32 sources, 1.19, 1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29811
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
- Updated to 0.2b20
- Updated the ini patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-15/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 3 Apr 2011 17:56:07 -0000 1.19
+++ .cvsignore 29 Jun 2011 17:14:17 -0000 1.20
@@ -1 +1 @@
-qmc2-0.2.b19.tar.bz2
+qmc2-0.2.b20.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-15/qmc2-ini.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmc2-ini.patch 16 May 2010 10:30:02 -0000 1.7
+++ qmc2-ini.patch 29 Jun 2011 17:14:17 -0000 1.8
@@ -1,71 +1,11 @@
diff -up qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini qmc2-0.2/sdlmame/inst/qmc2.ini.template
---- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2011-05-24 08:42:43.000000000 +0200
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2011-06-06 00:02:16.853946910 +0200
+@@ -1,8 +1,24 @@
+ [Frontend]
+ qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmame\Gamelist\UseCatverIni=true
qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-
- [MAME]
-+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
-+Configuration\Global\samplepath=DATADIR/mame/samples
-+Configuration\Global\artpath="DATADIR/mame/artwork;DATADIR/mame/effects"
-+Configuration\Global\cheat_file=DATADIR/mame/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mame/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mame/cfg
-+Configuration\Global\comment_directory=$HOME/.mame/comments
-+Configuration\Global\diff_directory=$HOME/.mame/diff
-+Configuration\Global\inipath="$HOME/.mame/ini;/etc/mame"
-+Configuration\Global\input_directory=$HOME/.mame/inp
-+Configuration\Global\memcard_directory=$HOME/.mame/memcard
-+Configuration\Global\nvram_directory=$HOME/.mame/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mame/snap
-+Configuration\Global\state_directory=$HOME/.mame/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mame
-+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
-+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
-
- [MESS]
-+Configuration\Global\rompath="DATADIR/mess/roms;DATADIR/mess/chds"
-+Configuration\Global\samplepath=DATADIR/mess/samples
-+Configuration\Global\artpath="DATADIR/mess/artwork;DATADIR/mess/effects"
-+Configuration\Global\cheat_file=DATADIR/mess/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mess/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mess/cfg
-+Configuration\Global\comment_directory=$HOME/.mess/comments
-+Configuration\Global\diff_directory=$HOME/.mess/diff
-+Configuration\Global\inipath="$HOME/.mess/ini;/etc/mess"
-+Configuration\Global\input_directory=$HOME/.mess/inp
-+Configuration\Global\memcard_directory=$HOME/.mess/memcard
-+Configuration\Global\nvram_directory=$HOME/.mess/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mess/snap
-+Configuration\Global\state_directory=$HOME/.mess/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
-diff -up qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini qmc2-0.2/sdlmess/inst/qmc2.ini.template
---- qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmess/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-+qmc2-sdlmame\Gamelist\UseCatverIni=true
- qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -84,6 +24,12 @@
+Configuration\Global\state_directory=$HOME/.mame/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -12,8 +28,27 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mame
+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
@@ -106,5 +52,11 @@
+Configuration\Global\state_directory=$HOME/.mess/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -23,3 +58,5 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-15/qmc2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qmc2.spec 3 Apr 2011 17:56:07 -0000 1.31
+++ qmc2.spec 29 Jun 2011 17:14:17 -0000 1.32
@@ -1,8 +1,8 @@
-%define beta b19
+%define beta b20
Name: qmc2
Version: 0.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
@@ -131,6 +131,10 @@
%changelog
+* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
+- Updated to 0.2b20
+- Updated the ini patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.23.b19
- Updated to 0.2b19
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-15/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 3 Apr 2011 17:56:07 -0000 1.19
+++ sources 29 Jun 2011 17:14:17 -0000 1.20
@@ -1 +1 @@
-b9cae829540066d21154e474b24ccc62 qmc2-0.2.b19.tar.bz2
+e868144815ff44a2146e839c2395c6d1 qmc2-0.2.b20.tar.bz2
13 years, 4 months
rpms/qmc2/devel .cvsignore, 1.19, 1.20 qmc2-ini.patch, 1.7, 1.8 qmc2.spec, 1.31, 1.32 sources, 1.19, 1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29699
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
- Updated to 0.2b20
- Updated the ini patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 3 Apr 2011 17:56:07 -0000 1.19
+++ .cvsignore 29 Jun 2011 17:14:05 -0000 1.20
@@ -1 +1 @@
-qmc2-0.2.b19.tar.bz2
+qmc2-0.2.b20.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmc2-ini.patch 16 May 2010 10:30:02 -0000 1.7
+++ qmc2-ini.patch 29 Jun 2011 17:14:06 -0000 1.8
@@ -1,71 +1,11 @@
diff -up qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini qmc2-0.2/sdlmame/inst/qmc2.ini.template
---- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini 2011-05-24 08:42:43.000000000 +0200
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2011-06-06 00:02:16.853946910 +0200
+@@ -1,8 +1,24 @@
+ [Frontend]
+ qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmame\Gamelist\UseCatverIni=true
qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-
- [MAME]
-+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
-+Configuration\Global\samplepath=DATADIR/mame/samples
-+Configuration\Global\artpath="DATADIR/mame/artwork;DATADIR/mame/effects"
-+Configuration\Global\cheat_file=DATADIR/mame/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mame/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mame/cfg
-+Configuration\Global\comment_directory=$HOME/.mame/comments
-+Configuration\Global\diff_directory=$HOME/.mame/diff
-+Configuration\Global\inipath="$HOME/.mame/ini;/etc/mame"
-+Configuration\Global\input_directory=$HOME/.mame/inp
-+Configuration\Global\memcard_directory=$HOME/.mame/memcard
-+Configuration\Global\nvram_directory=$HOME/.mame/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mame/snap
-+Configuration\Global\state_directory=$HOME/.mame/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mame
-+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
-+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
-
- [MESS]
-+Configuration\Global\rompath="DATADIR/mess/roms;DATADIR/mess/chds"
-+Configuration\Global\samplepath=DATADIR/mess/samples
-+Configuration\Global\artpath="DATADIR/mess/artwork;DATADIR/mess/effects"
-+Configuration\Global\cheat_file=DATADIR/mess/cheat.dat
-+Configuration\Global\ctrlrpath=DATADIR/mess/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mess/cfg
-+Configuration\Global\comment_directory=$HOME/.mess/comments
-+Configuration\Global\diff_directory=$HOME/.mess/diff
-+Configuration\Global\inipath="$HOME/.mess/ini;/etc/mess"
-+Configuration\Global\input_directory=$HOME/.mess/inp
-+Configuration\Global\memcard_directory=$HOME/.mess/memcard
-+Configuration\Global\nvram_directory=$HOME/.mess/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mess/snap
-+Configuration\Global\state_directory=$HOME/.mess/sta
-+Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
-+FilesAndDirectories\ExecutableFile=/usr/bin/mess
-+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
-diff -up qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini qmc2-0.2/sdlmess/inst/qmc2.ini.template
---- qmc2-0.2/sdlmess/inst/qmc2.ini.template.ini 2009-07-22 23:25:59.000000000 +0200
-+++ qmc2-0.2/sdlmess/inst/qmc2.ini.template 2010-05-16 12:25:51.000000000 +0200
-@@ -8,6 +8,7 @@ qmc2-sdlmame\FilesAndDirectories\Control
- qmc2-sdlmame\FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
- qmc2-sdlmame\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
- qmc2-sdlmame\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
-+qmc2-sdlmame\Gamelist\UseCatverIni=true
- qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -19,7 +20,43 @@ qmc2-sdlmess\FilesAndDirectories\TitleDi
- qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -84,6 +24,12 @@
+Configuration\Global\state_directory=$HOME/.mame/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -12,8 +28,27 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mame
+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
@@ -106,5 +52,11 @@
+Configuration\Global\state_directory=$HOME/.mess/sta
+Configuration\Global\video=opengl
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
+ FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
+ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
+@@ -23,3 +58,5 @@ FilesAndDirectories\ControllerDirectory=
+ FilesAndDirectories\MarqueeDirectory=DATADIR/qmc2/mrq/
+ FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+ FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qmc2.spec 3 Apr 2011 17:56:07 -0000 1.31
+++ qmc2.spec 29 Jun 2011 17:14:06 -0000 1.32
@@ -1,8 +1,8 @@
-%define beta b19
+%define beta b20
Name: qmc2
Version: 0.2
-Release: 0.23.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
@@ -131,6 +131,10 @@
%changelog
+* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.24.b20
+- Updated to 0.2b20
+- Updated the ini patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.2-0.23.b19
- Updated to 0.2b19
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 3 Apr 2011 17:56:07 -0000 1.19
+++ sources 29 Jun 2011 17:14:06 -0000 1.20
@@ -1 +1 @@
-b9cae829540066d21154e474b24ccc62 qmc2-0.2.b19.tar.bz2
+e868144815ff44a2146e839c2395c6d1 qmc2-0.2.b20.tar.bz2
13 years, 4 months