Author: belegdol Update of /cvs/nonfree/rpms/qmc2/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21274 Modified Files: .cvsignore qmc2-ini.patch qmc2.spec sources Log Message: * Sun May 16 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.2-0.19.b15 - Updated to 0.2b15 - Updated the ini template patch to include Catver.ini Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 17 Mar 2010 20:54:17 -0000 1.14 +++ .cvsignore 16 May 2010 10:30:02 -0000 1.15 @@ -1 +1 @@ -qmc2-0.2.b14.tar.bz2 +qmc2-0.2.b15.tar.bz2 qmc2-ini.patch: sdlmame/inst/qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++ sdlmess/inst/qmc2.ini.template | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) Index: qmc2-ini.patch =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qmc2-ini.patch 11 Sep 2009 07:59:37 -0000 1.6 +++ qmc2-ini.patch 16 May 2010 10:30:02 -0000 1.7 @@ -1,6 +1,15 @@ ---- inst/qmc2.ini.template.ini~ 2009-07-22 23:25:59.000000000 +0200 -+++ inst/qmc2.ini.template 2009-09-11 09:29:17.000000000 +0200 -@@ -19,7 +19,42 @@ +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-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] @@ -23,6 +32,62 @@ +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" ++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" Index: qmc2.spec =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- qmc2.spec 17 Mar 2010 20:54:17 -0000 1.24 +++ qmc2.spec 16 May 2010 10:30:02 -0000 1.25 @@ -1,8 +1,8 @@ -%define beta b14 +%define beta b15 Name: qmc2 Version: 0.2 -Release: 0.18.%{beta}%{?dist} +Release: 0.19.%{beta}%{?dist} Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files Group: Applications/Emulators @@ -56,14 +56,7 @@ mv %{name} sdlmame tar -xjf %{SOURCE0} mv %{name} sdlmess - -pushd sdlmess -%patch1 -p0 -b .ini -popd - -pushd sdlmame -%patch1 -p0 -b .ini -popd +%patch1 -p1 -b .ini %build @@ -138,6 +131,10 @@ %changelog +* Sun May 16 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.2-0.19.b15 +- Updated to 0.2b15 +- Updated the ini template patch to include Catver.ini + * Mon Mar 15 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.18.b14 - Updated to 0.2b14 - Dropped --fno-var-tracking-assignments Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 17 Mar 2010 20:54:17 -0000 1.14 +++ sources 16 May 2010 10:30:02 -0000 1.15 @@ -1 +1 @@ -6407c6e7ed8954275bb988dd1aa9b221 qmc2-0.2.b14.tar.bz2 +b98caae651a1ad1518c5906148e9ded0 qmc2-0.2.b15.tar.bz2