Author: belegdol Update of /cvs/nonfree/rpms/qmc2/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3957 Modified Files: .cvsignore qmc2-ini.patch qmc2.spec sources Log Message: * Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.35-1 - Updated to 0.35 - Updated the ini patch - Made the inter-subpackage dependencies arch-specific Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-15/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Nov 2011 18:53:09 -0000 1.21 +++ .cvsignore 6 Feb 2012 17:38:10 -0000 1.22 @@ -1 +1 @@ -qmc2-0.34.tar.bz2 +qmc2-0.35.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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qmc2-ini.patch 29 Jun 2011 17:14:17 -0000 1.8 +++ qmc2-ini.patch 6 Feb 2012 17:38:10 -0000 1.9 @@ -1,6 +1,6 @@ -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 2011-05-24 08:42:43.000000000 +0200 -+++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2011-06-06 00:02:16.853946910 +0200 +diff -up qmc2-0.35/sdlmame/inst/qmc2.ini.template.ini qmc2-0.35/sdlmame/inst/qmc2.ini.template +--- qmc2-0.35/sdlmame/inst/qmc2.ini.template.ini 2012-01-28 22:14:08.000000000 +0100 ++++ qmc2-0.35/sdlmame/inst/qmc2.ini.template 2012-02-04 21:35:54.034321890 +0100 @@ -1,8 +1,24 @@ [Frontend] qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/ @@ -26,10 +26,10 @@ 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/ +@@ -15,8 +31,27 @@ FilesAndDirectories\PCBDirectory=DATADIR + FilesAndDirectories\SoftwareSnapDirectory=DATADIR/qmc2/sws/ + FilesAndDirectories\SoftwareNotesFolder=DATADIR/qmc2/swn/ + FilesAndDirectories\SoftwareNotesTemplate=DATADIR/qmc2/swn/template.html +FilesAndDirectories\ExecutableFile=/usr/bin/mame +FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat +FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat @@ -54,9 +54,9 @@ 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/ +@@ -29,3 +64,5 @@ FilesAndDirectories\PCBDirectory=DATADIR + FilesAndDirectories\SoftwareSnapDirectory=DATADIR/qmc2/sws/ + FilesAndDirectories\SoftwareNotesFolder=DATADIR/qmc2/swn/ + FilesAndDirectories\SoftwareNotesTemplate=DATADIR/qmc2/swn/template.html +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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- qmc2.spec 15 Nov 2011 18:53:09 -0000 1.33 +++ qmc2.spec 6 Feb 2012 17:38:10 -0000 1.34 @@ -1,5 +1,5 @@ Name: qmc2 -Version: 0.34 +Version: 0.35 Release: 1%{?dist} Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files @@ -15,7 +15,7 @@ BuildRequires: rsync BuildRequires: SDL-devel Requires: games-menus -Requires: %{name}-binary = %{version}-%{release} +Requires: %{name}-binary%{?_isa} = %{version}-%{release} %description QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package @@ -25,9 +25,9 @@ %package sdlmame Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMAME support Group: Applications/Emulators -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: sdlmame -Provides: %{name}-binary = %{version}-%{release} +Provides: %{name}-binary%{?_isa} = %{version}-%{release} %description sdlmame QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package @@ -37,9 +37,9 @@ %package sdlmess Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMESS support Group: Applications/Emulators -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: sdlmess -Provides: %{name}-binary = %{version}-%{release} +Provides: %{name}-binary%{?_isa} = %{version}-%{release} %description sdlmess QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package @@ -120,6 +120,11 @@ %changelog +* Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.35-1 +- Updated to 0.35 +- Updated the ini patch +- Made the inter-subpackage dependencies arch-specific + * Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.34-1 - Updated to 0.34 (new versioning scheme) - Dropped obsolete Group, Buildroot, %%clean and %%defattr Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-15/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Nov 2011 18:53:09 -0000 1.21 +++ sources 6 Feb 2012 17:38:10 -0000 1.22 @@ -1 +1 @@ -3439fb62c95ff702e3c4194c05353169 qmc2-0.34.tar.bz2 +90b621579ac2773db91550b2650a9daf qmc2-0.35.tar.bz2