rpms/bsnes/F-9 .cvsignore, 1.4, 1.5 bsnes-0.037a-strip.patch, 1.1, 1.2 bsnes.spec, 1.4, 1.5 sources, 1.4, 1.5 bsnes.desktop, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7797
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes.spec sources
Removed Files:
bsnes.desktop
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
- Updated to 0.040
- The desktop file now comes with the tarball
- Icon is now installed to %{_datadir}/pixmaps
- The Qt ui is only built when it is legal to do so
- Updated the strip patch
- Fixed the last %changelog entry
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 20 Jan 2009 20:35:02 -0000 1.4
+++ .cvsignore 9 Mar 2009 18:14:20 -0000 1.5
@@ -1 +1 @@
-bsnes_v039.tar.bz2
+bsnes_v040.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes-0.037a-strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsnes-0.037a-strip.patch 4 Dec 2008 23:37:27 -0000 1.1
+++ bsnes-0.037a-strip.patch 9 Mar 2009 18:14:20 -0000 1.2
@@ -1,10 +1,10 @@
---- src/Makefile.strip 2008-10-17 14:35:28.000000000 +0200
-+++ src/Makefile 2008-11-27 14:28:51.000000000 +0100
-@@ -11,7 +11,6 @@
- cpp = $(subst cc,++,$(compiler)) $(flags)
+--- src/Makefile.strip 2009-02-22 10:13:58.000000000 +0100
++++ src/Makefile 2009-02-22 12:18:50.000000000 +0100
+@@ -13,7 +13,6 @@
+ cpp = $(subst cc,++,$(compiler))
obj = o
rule = -c $< -o $@
- link = -s
mkbin = -o$1
mkdef = -D$1
- mklib = -l$1
+ mkinc = -I$1
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes.spec 20 Jan 2009 20:35:02 -0000 1.4
+++ bsnes.spec 9 Mar 2009 18:14:20 -0000 1.5
@@ -1,4 +1,4 @@
-%define vernumber 039
+%define vernumber 040
Name: bsnes
Version: 0.%{vernumber}
@@ -9,7 +9,6 @@
License: Redistributable, no modification permitted
URL: http://byuu.cinnamonpirate.com/?page=bsnes
Source0: http://byuu.cinnamonpirate.com/files/%{name}_v%{vernumber}.tar.bz2
-Source1: bsnes.desktop
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
Patch1: bsnes-system-zlib.patch
@@ -20,16 +19,18 @@
#isn't available when the library is built stand alone
BuildRequires: desktop-file-utils
BuildRequires: freealut-devel
-BuildRequires: gtk2-devel
BuildRequires: libao-devel
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: minizip-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
-
-#libco, which is used by bsnes, only supports these
-ExclusiveArch: i386 x86_64
+#Qt >= 4.5 is required for legal reasons
+%if 0%{?fedora} >= 11
+BuildRequires: qt-devel >= 1:4.5.0-1%{?dist}
+%else
+BuildRequires: gtk2-devel
+%endif
%description
bsnes is an emulator that began development on 2004-10-14. The purpose of the
@@ -50,7 +51,7 @@
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
#use system optflags
-sed -i "s#flags = -O3#flags = %{optflags}#" src/Makefile
+sed -i "s#flags = -O3#flags = $RPM_OPT_FLAGS#" src/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
@@ -58,7 +59,13 @@
%build
pushd src
-make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true
+%if 0%{?fedora} >= 11
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+ moc=moc-qt4
+%else
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+ ui=ui_hiro
+%endif
%install
@@ -66,7 +73,8 @@
pushd src
make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
desktop-file-install --vendor=rpmfusion \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+ --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
%clean
@@ -77,11 +85,23 @@
%defattr(-,root,root,-)
%doc README.Fedora
%{_bindir}/bsnes
-%{_datadir}/icons/bsnes.png
+%{_datadir}/pixmaps/bsnes.png
%{_datadir}/applications/rpmfusion-bsnes.desktop
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
+- Updated to 0.040
+- The desktop file now comes with the tarball
+- Icon is now installed to %%{_datadir}/pixmaps
+- The Qt ui is only built when it is legal to do so
+- Updated the strip patch
+- Fixed the last %%changelog entry
+
+* Sun Feb 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-2
+- Dropped the ExclusiveArch, libco has a C fallback
+- Use macros consistently
+
* Tue Jan 20 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-1
- Updated to 0.039
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 20 Jan 2009 20:35:02 -0000 1.4
+++ sources 9 Mar 2009 18:14:20 -0000 1.5
@@ -1 +1 @@
-131a72097a90fc8cd614dc1dd4e0cc72 bsnes_v039.tar.bz2
+763e4ecd9b4b78432d70e1572f73efdb bsnes_v040.tar.bz2
--- bsnes.desktop DELETED ---
15 years, 1 month
rpms/bsnes/F-10 .cvsignore, 1.4, 1.5 bsnes-0.037a-strip.patch, 1.1, 1.2 bsnes.spec, 1.4, 1.5 sources, 1.4, 1.5 bsnes.desktop, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7709
Modified Files:
.cvsignore bsnes-0.037a-strip.patch bsnes.spec sources
Removed Files:
bsnes.desktop
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
- Updated to 0.040
- The desktop file now comes with the tarball
- Icon is now installed to %{_datadir}/pixmaps
- The Qt ui is only built when it is legal to do so
- Updated the strip patch
- Fixed the last %changelog entry
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 20 Jan 2009 20:34:52 -0000 1.4
+++ .cvsignore 9 Mar 2009 18:14:14 -0000 1.5
@@ -1 +1 @@
-bsnes_v039.tar.bz2
+bsnes_v040.tar.bz2
bsnes-0.037a-strip.patch:
Index: bsnes-0.037a-strip.patch
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes-0.037a-strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsnes-0.037a-strip.patch 4 Dec 2008 23:35:50 -0000 1.1
+++ bsnes-0.037a-strip.patch 9 Mar 2009 18:14:14 -0000 1.2
@@ -1,10 +1,10 @@
---- src/Makefile.strip 2008-10-17 14:35:28.000000000 +0200
-+++ src/Makefile 2008-11-27 14:28:51.000000000 +0100
-@@ -11,7 +11,6 @@
- cpp = $(subst cc,++,$(compiler)) $(flags)
+--- src/Makefile.strip 2009-02-22 10:13:58.000000000 +0100
++++ src/Makefile 2009-02-22 12:18:50.000000000 +0100
+@@ -13,7 +13,6 @@
+ cpp = $(subst cc,++,$(compiler))
obj = o
rule = -c $< -o $@
- link = -s
mkbin = -o$1
mkdef = -D$1
- mklib = -l$1
+ mkinc = -I$1
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsnes.spec 20 Jan 2009 20:34:52 -0000 1.4
+++ bsnes.spec 9 Mar 2009 18:14:14 -0000 1.5
@@ -1,4 +1,4 @@
-%define vernumber 039
+%define vernumber 040
Name: bsnes
Version: 0.%{vernumber}
@@ -9,7 +9,6 @@
License: Redistributable, no modification permitted
URL: http://byuu.cinnamonpirate.com/?page=bsnes
Source0: http://byuu.cinnamonpirate.com/files/%{name}_v%{vernumber}.tar.bz2
-Source1: bsnes.desktop
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
Patch1: bsnes-system-zlib.patch
@@ -20,16 +19,18 @@
#isn't available when the library is built stand alone
BuildRequires: desktop-file-utils
BuildRequires: freealut-devel
-BuildRequires: gtk2-devel
BuildRequires: libao-devel
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: minizip-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
-
-#libco, which is used by bsnes, only supports these
-ExclusiveArch: i386 x86_64
+#Qt >= 4.5 is required for legal reasons
+%if 0%{?fedora} >= 11
+BuildRequires: qt-devel >= 1:4.5.0-1%{?dist}
+%else
+BuildRequires: gtk2-devel
+%endif
%description
bsnes is an emulator that began development on 2004-10-14. The purpose of the
@@ -50,7 +51,7 @@
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec sed -i 's/\r//' {} \;
#use system optflags
-sed -i "s#flags = -O3#flags = %{optflags}#" src/Makefile
+sed -i "s#flags = -O3#flags = $RPM_OPT_FLAGS#" src/Makefile
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
@@ -58,7 +59,13 @@
%build
pushd src
-make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true
+%if 0%{?fedora} >= 11
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+ moc=moc-qt4
+%else
+make %{?_smp_mflags} platform=x compiler=gcc enable_gzip=true enable_jma=true \
+ ui=ui_hiro
+%endif
%install
@@ -66,7 +73,8 @@
pushd src
make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
desktop-file-install --vendor=rpmfusion \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+ --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
%clean
@@ -77,11 +85,23 @@
%defattr(-,root,root,-)
%doc README.Fedora
%{_bindir}/bsnes
-%{_datadir}/icons/bsnes.png
+%{_datadir}/pixmaps/bsnes.png
%{_datadir}/applications/rpmfusion-bsnes.desktop
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.040-1
+- Updated to 0.040
+- The desktop file now comes with the tarball
+- Icon is now installed to %%{_datadir}/pixmaps
+- The Qt ui is only built when it is legal to do so
+- Updated the strip patch
+- Fixed the last %%changelog entry
+
+* Sun Feb 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-2
+- Dropped the ExclusiveArch, libco has a C fallback
+- Use macros consistently
+
* Tue Jan 20 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.039-1
- Updated to 0.039
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 20 Jan 2009 20:34:52 -0000 1.4
+++ sources 9 Mar 2009 18:14:14 -0000 1.5
@@ -1 +1 @@
-131a72097a90fc8cd614dc1dd4e0cc72 bsnes_v039.tar.bz2
+763e4ecd9b4b78432d70e1572f73efdb bsnes_v040.tar.bz2
--- bsnes.desktop DELETED ---
15 years, 1 month
rpms/qmc2/F-9 .cvsignore, 1.6, 1.7 qmc2-ini.patch, 1.3, 1.4 qmc2.spec, 1.9, 1.10 sources, 1.6, 1.7 qmc2.png, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7198
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Removed Files:
qmc2.png
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
- Updated to 0.2b7
- Dropped the rawhide fedora-release workaround
- Overhauled for sdlmess support
- Desktop files now come with the tarball and use the shipped icon
- Updated Summary and %description (M.A.M.E. → M.A.M.E./M.E.S.S.)
- Updated the ini patch
- Avoid installing qmc2.ini.new
- Dropped hicolor-icon-theme from Requires
- Switched to system-wide Qt translations
- No longer force Windows Qt style
- Updated the URL
- Added libXmu-devel to BuildRequires
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Jan 2009 12:10:58 -0000 1.6
+++ .cvsignore 9 Mar 2009 18:10:06 -0000 1.7
@@ -1 +1 @@
-qmc2-0.2.b6.tar.bz2
+qmc2-0.2.b7.tar.bz2
qmc2-ini.patch:
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-9/qmc2-ini.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmc2-ini.patch 5 Jan 2009 12:10:58 -0000 1.3
+++ qmc2-ini.patch 9 Mar 2009 18:10:06 -0000 1.4
@@ -1,10 +1,7 @@
---- 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\PreviewDirectory=DATADIR/qmc2/prv/
- FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-+GUI\Style=Windows
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini~ 2009-01-16 17:27:17.000000000 +0100
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2009-02-13 14:24:37.000000000 +0100
+@@ -7,7 +7,42 @@
+ qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -23,7 +20,6 @@
+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
@@ -45,4 +41,5 @@
+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
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-9/qmc2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qmc2.spec 5 Jan 2009 12:10:58 -0000 1.9
+++ qmc2.spec 9 Mar 2009 18:10:06 -0000 1.10
@@ -1,60 +1,95 @@
-%define beta b6
+%define beta b7
Name: qmc2
Version: 0.2
-Release: 0.8.%{beta}%{?dist}
-Summary: M.A.M.E. Catalog / Launcher II
+Release: 0.9.%{beta}%{?dist}
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
License: GPLv2
-URL: http://www.mameworld.net/mamecat
+URL: http://qmc2.arcadehits.net/
Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
-Source1: %{name}.png
Patch1: qmc2-ini.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
+BuildRequires: libXmu-devel
BuildRequires: phonon-devel
BuildRequires: qt4-devel
BuildRequires: rsync
BuildRequires: SDL-devel
Requires: games-menus
-Requires: hicolor-icon-theme
-Requires: sdlmame
+Requires: %{name}-binary = %{version}-%{release}
%description
-QMC2 is a Qt4 based UNIX MAME frontend for SDLMAME.
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the common files.
+
+
+%package sdlmame
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMAME support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmame
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmame
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMAME support.
+
+
+%package sdlmess
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMESS support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmess
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmess
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMESS support.
%prep
-%setup -qn %{name}
-%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
-[Desktop Entry]
-Encoding=UTF-8
-Name=%{name}
-GenericName=M.A.M.E. Catalog / Launcher II
-Comment=SDL MAME Frontend
-Exec=%{name}
-Icon=%{name}.png
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-EOF
+%setup -qcT
+tar -xjf %{SOURCE0}
+mv %{name} sdlmame
+tar -xjf %{SOURCE0}
+mv %{name} sdlmess
+%patch1 -p1 -b .ini~
%build
-QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1 PRETTY=0\
- PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+pushd sdlmess
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS
+popd
+
+pushd sdlmame
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME
+popd
%install
rm -rf $RPM_BUILD_ROOT
-QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PRETTY=0\
- CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+
+pushd sdlmess
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS QT_TRANSLATION=../../qt4/translations
+popd
+
+#remove the qmc2.ini since we only need one
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/qmc2/qmc2.ini
+
+pushd sdlmame
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME QT_TRANSLATION=../../qt4/translations
+popd
# remove docs since we are intalling docs in %doc
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -62,26 +97,14 @@
ln -s ../doc/%{name}-%{version} doc
popd
-# install fedora desktop file
-desktop-file-install --vendor=dribble \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{name}.desktop
-
-# install icon
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+#validate the desktop files
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmame.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmess.desktop
#fix the executable permissions
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmame
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmess
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/runonce
%clean
@@ -90,16 +113,40 @@
%files
%defattr(-,root,root,-)
-%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
+%doc sdlmame/data/doc/html
+%config(noreplace) %{_sysconfdir}/qmc2
+%{_bindir}/runonce
+%{_datadir}/qmc2
+
+
+%files sdlmame
+%defattr(-,root,root,-)
+%{_bindir}/qmc2
+%{_bindir}/qmc2-sdlmame
+%{_datadir}/applications/qmc2-sdlmame.desktop
+
+
+%files sdlmess
+%defattr(-,root,root,-)
+%{_bindir}/qmc2-sdlmess
+%{_datadir}/applications/qmc2-sdlmess.desktop
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
+- Updated to 0.2b7
+- Dropped the rawhide fedora-release workaround
+- Overhauled for sdlmess support
+- Desktop files now come with the tarball and use the shipped icon
+- Updated Summary and %%description (M.A.M.E. → M.A.M.E./M.E.S.S.)
+- Updated the ini patch
+- Avoid installing qmc2.ini.new
+- Dropped hicolor-icon-theme from Requires
+- Switched to system-wide Qt translations
+- No longer force Windows Qt style
+- Updated the URL
+- Added libXmu-devel to BuildRequires
+
* Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6
- Updated to 0.2b6
- Updated the ini patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Jan 2009 12:10:58 -0000 1.6
+++ sources 9 Mar 2009 18:10:06 -0000 1.7
@@ -1 +1 @@
-bba3234e509811e7c2b46a4de75abe43 qmc2-0.2.b6.tar.bz2
+fa8de835c8f19a47cc4cf76eb5977e43 qmc2-0.2.b7.tar.bz2
15 years, 1 month
rpms/qmc2/F-10 .cvsignore, 1.6, 1.7 qmc2-ini.patch, 1.3, 1.4 qmc2.spec, 1.10, 1.11 sources, 1.6, 1.7 qmc2.png, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7117
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Removed Files:
qmc2.png
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
- Updated to 0.2b7
- Dropped the rawhide fedora-release workaround
- Overhauled for sdlmess support
- Desktop files now come with the tarball and use the shipped icon
- Updated Summary and %description (M.A.M.E. → M.A.M.E./M.E.S.S.)
- Updated the ini patch
- Avoid installing qmc2.ini.new
- Dropped hicolor-icon-theme from Requires
- Switched to system-wide Qt translations
- No longer force Windows Qt style
- Updated the URL
- Added libXmu-devel to BuildRequires
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Jan 2009 12:10:38 -0000 1.6
+++ .cvsignore 9 Mar 2009 18:10:01 -0000 1.7
@@ -1 +1 @@
-qmc2-0.2.b6.tar.bz2
+qmc2-0.2.b7.tar.bz2
qmc2-ini.patch:
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-10/qmc2-ini.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmc2-ini.patch 5 Jan 2009 12:10:38 -0000 1.3
+++ qmc2-ini.patch 9 Mar 2009 18:10:01 -0000 1.4
@@ -1,10 +1,7 @@
---- 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\PreviewDirectory=DATADIR/qmc2/prv/
- FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-+GUI\Style=Windows
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini~ 2009-01-16 17:27:17.000000000 +0100
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2009-02-13 14:24:37.000000000 +0100
+@@ -7,7 +7,42 @@
+ qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -23,7 +20,6 @@
+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
@@ -45,4 +41,5 @@
+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
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-10/qmc2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qmc2.spec 5 Jan 2009 12:10:38 -0000 1.10
+++ qmc2.spec 9 Mar 2009 18:10:01 -0000 1.11
@@ -1,60 +1,95 @@
-%define beta b6
+%define beta b7
Name: qmc2
Version: 0.2
-Release: 0.8.%{beta}%{?dist}
-Summary: M.A.M.E. Catalog / Launcher II
+Release: 0.9.%{beta}%{?dist}
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
License: GPLv2
-URL: http://www.mameworld.net/mamecat
+URL: http://qmc2.arcadehits.net/
Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
-Source1: %{name}.png
Patch1: qmc2-ini.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
+BuildRequires: libXmu-devel
BuildRequires: phonon-devel
BuildRequires: qt4-devel
BuildRequires: rsync
BuildRequires: SDL-devel
Requires: games-menus
-Requires: hicolor-icon-theme
-Requires: sdlmame
+Requires: %{name}-binary = %{version}-%{release}
%description
-QMC2 is a Qt4 based UNIX MAME frontend for SDLMAME.
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the common files.
+
+
+%package sdlmame
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMAME support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmame
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmame
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMAME support.
+
+
+%package sdlmess
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMESS support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmess
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmess
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMESS support.
%prep
-%setup -qn %{name}
-%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
-[Desktop Entry]
-Encoding=UTF-8
-Name=%{name}
-GenericName=M.A.M.E. Catalog / Launcher II
-Comment=SDL MAME Frontend
-Exec=%{name}
-Icon=%{name}.png
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-EOF
+%setup -qcT
+tar -xjf %{SOURCE0}
+mv %{name} sdlmame
+tar -xjf %{SOURCE0}
+mv %{name} sdlmess
+%patch1 -p1 -b .ini~
%build
-QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1 PRETTY=0\
- PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+pushd sdlmess
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS
+popd
+
+pushd sdlmame
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME
+popd
%install
rm -rf $RPM_BUILD_ROOT
-QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PRETTY=0\
- CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+
+pushd sdlmess
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS QT_TRANSLATION=../../qt4/translations
+popd
+
+#remove the qmc2.ini since we only need one
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/qmc2/qmc2.ini
+
+pushd sdlmame
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME QT_TRANSLATION=../../qt4/translations
+popd
# remove docs since we are intalling docs in %doc
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -62,26 +97,14 @@
ln -s ../doc/%{name}-%{version} doc
popd
-# install fedora desktop file
-desktop-file-install --vendor=dribble \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{name}.desktop
-
-# install icon
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+#validate the desktop files
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmame.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmess.desktop
#fix the executable permissions
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmame
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmess
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/runonce
%clean
@@ -90,16 +113,40 @@
%files
%defattr(-,root,root,-)
-%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
+%doc sdlmame/data/doc/html
+%config(noreplace) %{_sysconfdir}/qmc2
+%{_bindir}/runonce
+%{_datadir}/qmc2
+
+
+%files sdlmame
+%defattr(-,root,root,-)
+%{_bindir}/qmc2
+%{_bindir}/qmc2-sdlmame
+%{_datadir}/applications/qmc2-sdlmame.desktop
+
+
+%files sdlmess
+%defattr(-,root,root,-)
+%{_bindir}/qmc2-sdlmess
+%{_datadir}/applications/qmc2-sdlmess.desktop
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
+- Updated to 0.2b7
+- Dropped the rawhide fedora-release workaround
+- Overhauled for sdlmess support
+- Desktop files now come with the tarball and use the shipped icon
+- Updated Summary and %%description (M.A.M.E. → M.A.M.E./M.E.S.S.)
+- Updated the ini patch
+- Avoid installing qmc2.ini.new
+- Dropped hicolor-icon-theme from Requires
+- Switched to system-wide Qt translations
+- No longer force Windows Qt style
+- Updated the URL
+- Added libXmu-devel to BuildRequires
+
* Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6
- Updated to 0.2b6
- Updated the ini patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Jan 2009 12:10:38 -0000 1.6
+++ sources 9 Mar 2009 18:10:01 -0000 1.7
@@ -1 +1 @@
-bba3234e509811e7c2b46a4de75abe43 qmc2-0.2.b6.tar.bz2
+fa8de835c8f19a47cc4cf76eb5977e43 qmc2-0.2.b7.tar.bz2
15 years, 1 month
rpms/qmc2/devel .cvsignore, 1.6, 1.7 qmc2-ini.patch, 1.3, 1.4 qmc2.spec, 1.10, 1.11 sources, 1.6, 1.7 qmc2.png, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7030
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Removed Files:
qmc2.png
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
- Updated to 0.2b7
- Dropped the rawhide fedora-release workaround
- Overhauled for sdlmess support
- Desktop files now come with the tarball and use the shipped icon
- Updated Summary and %description (M.A.M.E. → M.A.M.E./M.E.S.S.)
- Updated the ini patch
- Avoid installing qmc2.ini.new
- Dropped hicolor-icon-theme from Requires
- Switched to system-wide Qt translations
- No longer force Windows Qt style
- Updated the URL
- Added libXmu-devel to BuildRequires
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Jan 2009 12:10:27 -0000 1.6
+++ .cvsignore 9 Mar 2009 18:09:53 -0000 1.7
@@ -1 +1 @@
-qmc2-0.2.b6.tar.bz2
+qmc2-0.2.b7.tar.bz2
qmc2-ini.patch:
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmc2-ini.patch 5 Jan 2009 12:10:27 -0000 1.3
+++ qmc2-ini.patch 9 Mar 2009 18:09:53 -0000 1.4
@@ -1,10 +1,7 @@
---- 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\PreviewDirectory=DATADIR/qmc2/prv/
- FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-+GUI\Style=Windows
+--- qmc2-0.2/sdlmame/inst/qmc2.ini.template.ini~ 2009-01-16 17:27:17.000000000 +0100
++++ qmc2-0.2/sdlmame/inst/qmc2.ini.template 2009-02-13 14:24:37.000000000 +0100
+@@ -7,7 +7,42 @@
+ qmc2-sdlmess\FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
@@ -23,7 +20,6 @@
+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
@@ -45,4 +41,5 @@
+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
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qmc2.spec 5 Jan 2009 12:10:27 -0000 1.10
+++ qmc2.spec 9 Mar 2009 18:09:53 -0000 1.11
@@ -1,60 +1,95 @@
-%define beta b6
+%define beta b7
Name: qmc2
Version: 0.2
-Release: 0.8.%{beta}%{?dist}
-Summary: M.A.M.E. Catalog / Launcher II
+Release: 0.9.%{beta}%{?dist}
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
License: GPLv2
-URL: http://www.mameworld.net/mamecat
+URL: http://qmc2.arcadehits.net/
Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
-Source1: %{name}.png
Patch1: qmc2-ini.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
+BuildRequires: libXmu-devel
BuildRequires: phonon-devel
BuildRequires: qt4-devel
BuildRequires: rsync
BuildRequires: SDL-devel
Requires: games-menus
-Requires: hicolor-icon-theme
-Requires: sdlmame
+Requires: %{name}-binary = %{version}-%{release}
%description
-QMC2 is a Qt4 based UNIX MAME frontend for SDLMAME.
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the common files.
+
+
+%package sdlmame
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMAME support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmame
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmame
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMAME support.
+
+
+%package sdlmess
+Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, SDLMESS support
+Group: Applications/Emulators
+Requires: %{name} = %{version}-%{release}
+Requires: sdlmess
+Provides: %{name}-binary = %{version}-%{release}
+
+%description sdlmess
+QMC2 is a Qt4 based UNIX frontend for SDLMAME and SDLMESS. This package
+contains the parts required for SDLMESS support.
%prep
-%setup -qn %{name}
-%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
-[Desktop Entry]
-Encoding=UTF-8
-Name=%{name}
-GenericName=M.A.M.E. Catalog / Launcher II
-Comment=SDL MAME Frontend
-Exec=%{name}
-Icon=%{name}.png
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
-EOF
+%setup -qcT
+tar -xjf %{SOURCE0}
+mv %{name} sdlmame
+tar -xjf %{SOURCE0}
+mv %{name} sdlmess
+%patch1 -p1 -b .ini~
%build
-QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1 PRETTY=0\
- PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+pushd sdlmess
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS
+popd
+
+pushd sdlmame
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
+ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME
+popd
%install
rm -rf $RPM_BUILD_ROOT
-QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PRETTY=0\
- CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
+
+pushd sdlmess
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMESS QT_TRANSLATION=../../qt4/translations
+popd
+
+#remove the qmc2.ini since we only need one
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/qmc2/qmc2.ini
+
+pushd sdlmame
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
+ PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
+ EMULATOR=SDLMAME QT_TRANSLATION=../../qt4/translations
+popd
# remove docs since we are intalling docs in %doc
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -62,26 +97,14 @@
ln -s ../doc/%{name}-%{version} doc
popd
-# install fedora desktop file
-desktop-file-install --vendor=dribble \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{name}.desktop
-
-# install icon
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+#validate the desktop files
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmame.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qmc2-sdlmess.desktop
#fix the executable permissions
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmame
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/qmc2-sdlmess
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/runonce
%clean
@@ -90,16 +113,40 @@
%files
%defattr(-,root,root,-)
-%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
+%doc sdlmame/data/doc/html
+%config(noreplace) %{_sysconfdir}/qmc2
+%{_bindir}/runonce
+%{_datadir}/qmc2
+
+
+%files sdlmame
+%defattr(-,root,root,-)
+%{_bindir}/qmc2
+%{_bindir}/qmc2-sdlmame
+%{_datadir}/applications/qmc2-sdlmame.desktop
+
+
+%files sdlmess
+%defattr(-,root,root,-)
+%{_bindir}/qmc2-sdlmess
+%{_datadir}/applications/qmc2-sdlmess.desktop
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.9.b7
+- Updated to 0.2b7
+- Dropped the rawhide fedora-release workaround
+- Overhauled for sdlmess support
+- Desktop files now come with the tarball and use the shipped icon
+- Updated Summary and %%description (M.A.M.E. → M.A.M.E./M.E.S.S.)
+- Updated the ini patch
+- Avoid installing qmc2.ini.new
+- Dropped hicolor-icon-theme from Requires
+- Switched to system-wide Qt translations
+- No longer force Windows Qt style
+- Updated the URL
+- Added libXmu-devel to BuildRequires
+
* Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6
- Updated to 0.2b6
- Updated the ini patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Jan 2009 12:10:27 -0000 1.6
+++ sources 9 Mar 2009 18:09:53 -0000 1.7
@@ -1 +1 @@
-bba3234e509811e7c2b46a4de75abe43 qmc2-0.2.b6.tar.bz2
+fa8de835c8f19a47cc4cf76eb5977e43 qmc2-0.2.b7.tar.bz2
15 years, 1 month
rpms/sdlmame/F-9 .cvsignore, 1.34, 1.35 sdlmame.spec, 1.41, 1.42 sources, 1.35, 1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4946
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
- Updated to 0.130
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 5 Mar 2009 18:50:06 -0000 1.34
+++ .cvsignore 9 Mar 2009 17:33:20 -0000 1.35
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0129u6.zip
+sdlmame0130.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sdlmame.spec 5 Mar 2009 19:24:42 -0000 1.41
+++ sdlmame.spec 9 Mar 2009 17:33:20 -0000 1.42
@@ -1,4 +1,4 @@
-%define beta 0129u6
+#define beta 0129u6
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0130
-Release: 0.6.%{?beta}%{?dist}
+Release: 1%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -212,6 +212,9 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
+- Updated to 0.130
+
* Thu Mar 05 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.6.0129u6
- Updated to 0.129u6
- Dropped the upstreamed gcc-4.4 fix
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 5 Mar 2009 18:50:06 -0000 1.35
+++ sources 9 Mar 2009 17:33:20 -0000 1.36
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-8fe408071ec97732e403bd7d1ce56861 sdlmame0129u6.zip
+b33d3545049e8e2b8da5d7d7cc3b843b sdlmame0130.zip
15 years, 1 month
rpms/sdlmame/F-10 .cvsignore, 1.34, 1.35 sdlmame.spec, 1.43, 1.44 sources, 1.35, 1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4869
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
- Updated to 0.130
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 5 Mar 2009 18:49:16 -0000 1.34
+++ .cvsignore 9 Mar 2009 17:33:15 -0000 1.35
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0129u6.zip
+sdlmame0130.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sdlmame.spec 5 Mar 2009 19:24:35 -0000 1.43
+++ sdlmame.spec 9 Mar 2009 17:33:15 -0000 1.44
@@ -1,4 +1,4 @@
-%define beta 0129u6
+#define beta 0129u6
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0130
-Release: 0.6.%{?beta}%{?dist}
+Release: 1%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -212,6 +212,9 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
+- Updated to 0.130
+
* Thu Mar 05 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.6.0129u6
- Updated to 0.129u6
- Dropped the upstreamed gcc-4.4 fix
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 5 Mar 2009 18:49:16 -0000 1.35
+++ sources 9 Mar 2009 17:33:15 -0000 1.36
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-8fe408071ec97732e403bd7d1ce56861 sdlmame0129u6.zip
+b33d3545049e8e2b8da5d7d7cc3b843b sdlmame0130.zip
15 years, 1 month
rpms/sdlmame/devel .cvsignore, 1.34, 1.35 sdlmame.spec, 1.42, 1.43 sources, 1.35, 1.36
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4786
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
- Updated to 0.130
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 5 Mar 2009 18:48:05 -0000 1.34
+++ .cvsignore 9 Mar 2009 17:33:08 -0000 1.35
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0129u6.zip
+sdlmame0130.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sdlmame.spec 5 Mar 2009 19:24:29 -0000 1.42
+++ sdlmame.spec 9 Mar 2009 17:33:08 -0000 1.43
@@ -1,4 +1,4 @@
-%define beta 0129u6
+#define beta 0129u6
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0130
-Release: 0.6.%{?beta}%{?dist}
+Release: 1%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -212,6 +212,9 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-1
+- Updated to 0.130
+
* Thu Mar 05 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.6.0129u6
- Updated to 0.129u6
- Dropped the upstreamed gcc-4.4 fix
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 5 Mar 2009 18:48:05 -0000 1.35
+++ sources 9 Mar 2009 17:33:08 -0000 1.36
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-8fe408071ec97732e403bd7d1ce56861 sdlmame0129u6.zip
+b33d3545049e8e2b8da5d7d7cc3b843b sdlmame0130.zip
15 years, 1 month
rpms/sdlmame-data-samples/F-9 sdlmame-data-samples.spec, 1.2, 1.3 sources, 1.2, 1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16228
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
- Added cosmica
- Updated the URL
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-9/sdlmame-data-samples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmame-data-samples.spec 30 Jul 2008 16:29:12 -0000 1.2
+++ sdlmame-data-samples.spec 9 Mar 2009 11:04:57 -0000 1.3
@@ -1,17 +1,17 @@
Name: sdlmame-data-samples
-Version: 0126
-Release: 2%{?dist}
+Version: 0129
+Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
Group: Amusements/Games
License: Distributable
-URL: http://www.mameworld.net/samples
+URL: http://samples.mameworld.info
Source0: sdlmame-samples.tar
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: sdlmame >= 0126
+Requires: sdlmame >= 0129
%description
%{summary}.
@@ -41,6 +41,10 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
+- Added cosmica
+- Updated the URL
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0126-2
- rebuild for buildsys cflags issue
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jul 2008 11:21:40 -0000 1.2
+++ sources 9 Mar 2009 11:04:57 -0000 1.3
@@ -1 +1 @@
-14cbe838a8f242b8ddbdd5b2c758466e sdlmame-samples.tar
+5f05530db3c6b260cbe9bd9f8832da83 sdlmame-samples.tar
15 years, 1 month
rpms/sdlmame-data-samples/F-10 sdlmame-data-samples.spec, 1.2, 1.3 sources, 1.2, 1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16152
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
- Added cosmica
- Updated the URL
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-10/sdlmame-data-samples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmame-data-samples.spec 30 Jul 2008 16:28:36 -0000 1.2
+++ sdlmame-data-samples.spec 9 Mar 2009 11:04:51 -0000 1.3
@@ -1,17 +1,17 @@
Name: sdlmame-data-samples
-Version: 0126
-Release: 2%{?dist}
+Version: 0129
+Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
Group: Amusements/Games
License: Distributable
-URL: http://www.mameworld.net/samples
+URL: http://samples.mameworld.info
Source0: sdlmame-samples.tar
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: sdlmame >= 0126
+Requires: sdlmame >= 0129
%description
%{summary}.
@@ -41,6 +41,10 @@
%changelog
+* Mon Mar 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-1
+- Added cosmica
+- Updated the URL
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0126-2
- rebuild for buildsys cflags issue
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jul 2008 11:20:14 -0000 1.2
+++ sources 9 Mar 2009 11:04:51 -0000 1.3
@@ -1 +1 @@
-14cbe838a8f242b8ddbdd5b2c758466e sdlmame-samples.tar
+5f05530db3c6b260cbe9bd9f8832da83 sdlmame-samples.tar
15 years, 1 month