Author: belegdol Update of /cvs/nonfree/rpms/qmc2/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2087 Modified Files: .cvsignore qmc2-ini.patch qmc2.spec sources Log Message: * Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6 - Updated to 0.2b6 - Updated the ini patch - Updated the rawhide fedora-relase workaround - Added PRETTY=0 to compilation flags Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Oct 2008 21:15:47 -0000 1.5 +++ .cvsignore 5 Jan 2009 12:10:58 -0000 1.6 @@ -1 +1 @@ -qmc2-0.2.b5.tar.bz2 +qmc2-0.2.b6.tar.bz2 qmc2-ini.patch: Index: qmc2-ini.patch =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-9/qmc2-ini.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qmc2-ini.patch 7 Jul 2008 09:43:35 -0000 1.2 +++ qmc2-ini.patch 5 Jan 2009 12:10:58 -0000 1.3 @@ -1,16 +1,12 @@ ---- inst/qmc2.ini.template.ini~ 2007-10-16 15:38:29.000000000 +0200 -+++ inst/qmc2.ini.template 2008-06-29 16:59:47.000000000 +0200 -@@ -1,5 +1,27 @@ - [Frontend] +--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini~ 2008-12-21 16:15:01.000000000 +0100 ++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2008-12-25 12:01:44.000000000 +0100 +@@ -2,9 +2,45 @@ FilesAndDirectories\DataDirectory=DATADIR/qmc2/ -+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat -+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat - FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/template.xml FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/ FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/ +GUI\Style=Windows -+ -+[MAME] + + [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" @@ -26,5 +22,27 @@ +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\ROMPath="DATADIR/mame/roms;DATADIR/mame/chds" +FilesAndDirectories\ExecutableFile=/usr/bin/mame ++FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat ++FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat + + [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\GameInfoDB=DATADIR/mess/sysinfo.dat Index: qmc2.spec =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-9/qmc2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qmc2.spec 29 Oct 2008 10:55:09 -0000 1.8 +++ qmc2.spec 5 Jan 2009 12:10:58 -0000 1.9 @@ -1,8 +1,8 @@ -%define beta b5 +%define beta b6 Name: qmc2 Version: 0.2 -Release: 0.7.%{beta}%{?dist}.1 +Release: 0.8.%{beta}%{?dist} Summary: M.A.M.E. Catalog / Launcher II Group: Applications/Emulators @@ -28,7 +28,8 @@ %prep %setup -qn %{name} -%patch1 -p0 -b .ini~ +%patch1 -p2 -b .ini~ +%{__cp} arch/Linux/Fedora_release_10.cfg arch/Linux/Fedora_release_10.90.cfg # create qmc2 desktop file cat > %{name}.desktop << EOF @@ -46,13 +47,13 @@ %build -QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\ +QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1 PRETTY=0\ PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} %install rm -rf $RPM_BUILD_ROOT -QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1\ +QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PRETTY=0\ CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} # remove docs since we are intalling docs in %doc @@ -92,14 +93,18 @@ %doc data/doc/html %config(noreplace) %{_sysconfdir}/%{name} %{_bindir}/%{name} +%{_bindir}/%{name}-sdlmame %{_datadir}/%{name} %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %{_datadir}/applications/*.desktop %changelog -* Wed Oct 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.7.b5.fc9.1 -- Rebuilt, as something seems to have eaten a part of i386 rpm +* Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6 +- Updated to 0.2b6 +- Updated the ini patch +- Updated the rawhide fedora-relase workaround +- Added PRETTY=0 to compilation flags * Thu Oct 16 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.7.b5 - Updated to 0.2b5 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Oct 2008 21:15:47 -0000 1.5 +++ sources 5 Jan 2009 12:10:58 -0000 1.6 @@ -1 +1 @@ -a6746dfd348b3967ffdd89f20e3b9b01 qmc2-0.2.b5.tar.bz2 +bba3234e509811e7c2b46a4de75abe43 qmc2-0.2.b6.tar.bz2