6:18 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17212
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Added Files:
qmc2-0.43-os-detect.patch
Log Message:
* Sat Apr 26 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.43-1
- Updated to 0.43
- Updated the ini patch to use category.ini supplied with qmc2 by default
- Added bundled(lzma-sdk) = 9.22 to Provides
qmc2-0.43-os-detect.patch:
sdlmame/scripts/os-detect.sh | 15 ++++++++++-----
sdlmess/scripts/os-detect.sh | 15 ++++++++++-----
2 files changed, 20 insertions(+), 10 deletions(-)
--- NEW FILE qmc2-0.43-os-detect.patch ---
diff -up qmc2-0.43/sdlmame/scripts/os-detect.sh.os-detect
qmc2-0.43/sdlmame/scripts/os-detect.sh
--- qmc2-0.43/sdlmame/scripts/os-detect.sh.os-detect 2014-03-13 18:04:23.612684676 +0100
+++ qmc2-0.43/sdlmame/scripts/os-detect.sh 2014-04-26 19:28:20.221897625 +0200
@@ -7,15 +7,20 @@ DIST="`uname -r`"
if [ "${OS}" = "Linux" ] ; then
if [ -f /etc/os-release ] ; then
- DIST="`cat /etc/os-release | tr '\n' ' ' | sed 's/\
VERSION_ID.*//' | sed 's/\ (.*)//' | sed 's/NAME=//g' | sed
's/VERSION=//g' | sed 's/\"//g'`"
+ VERSION=$(cat /etc/os-release | egrep "\bVERSION_ID\b" | sed
's/VERSION_ID=//g' | sed 's/\"//g')
+ NAME=$(cat /etc/os-release | egrep "\bNAME\b" | sed 's/NAME=//g' |
sed 's/\"//g' | tr " " '_')
+ if [ "$NAME" == "Fedora" ]; then
+ NAME="Fedora_release"
+ fi
+ DIST="$(echo $NAME)_$(echo $VERSION)"
elif [ -f /etc/mandriva-release ] ; then
- DIST="`cat /etc/mandriva-release | sed 's/\ for .*//' | sed 's/\
(.*)//'`"
+ DIST="$(cat /etc/mandriva-release | sed 's/\ for .*//' | sed 's/\
(.*)//')"
elif [ -f /etc/redhat-release ] ; then
- DIST="`cat /etc/redhat-release | sed 's/\ (.*)//'`"
+ DIST="$(cat /etc/redhat-release | sed 's/\ (.*)//')"
elif [ -f /etc/SuSE-release ] ; then
- DIST="`cat /etc/SuSE-release | tr '\n' ' ' | sed 's/\
VERSION.*//' | sed 's/\ (.*)//'`"
+ DIST="$(cat /etc/SuSE-release | tr '\n' ' ' | sed 's/\
VERSION.*//' | sed 's/\ (.*)//')"
elif [ -f /etc/debian_version ] ; then
- DIST="`echo Debian` `cat /etc/debian_version | sed 's/\//-/'`"
+ DIST="$(echo Debian) $(cat /etc/debian_version | sed 's/\//-/')"
fi
fi
diff -up qmc2-0.43/sdlmess/scripts/os-detect.sh.os-detect
qmc2-0.43/sdlmess/scripts/os-detect.sh
--- qmc2-0.43/sdlmess/scripts/os-detect.sh.os-detect 2014-03-13 18:04:23.612684676 +0100
+++ qmc2-0.43/sdlmess/scripts/os-detect.sh 2014-04-26 19:28:22.427919690 +0200
@@ -7,15 +7,20 @@ DIST="`uname -r`"
if [ "${OS}" = "Linux" ] ; then
if [ -f /etc/os-release ] ; then
- DIST="`cat /etc/os-release | tr '\n' ' ' | sed 's/\
VERSION_ID.*//' | sed 's/\ (.*)//' | sed 's/NAME=//g' | sed
's/VERSION=//g' | sed 's/\"//g'`"
+ VERSION=$(cat /etc/os-release | egrep "\bVERSION_ID\b" | sed
's/VERSION_ID=//g' | sed 's/\"//g')
+ NAME=$(cat /etc/os-release | egrep "\bNAME\b" | sed 's/NAME=//g' |
sed 's/\"//g' | tr " " '_')
+ if [ "$NAME" == "Fedora" ]; then
+ NAME="Fedora_release"
+ fi
+ DIST="$(echo $NAME)_$(echo $VERSION)"
elif [ -f /etc/mandriva-release ] ; then
- DIST="`cat /etc/mandriva-release | sed 's/\ for .*//' | sed 's/\
(.*)//'`"
+ DIST="$(cat /etc/mandriva-release | sed 's/\ for .*//' | sed 's/\
(.*)//')"
elif [ -f /etc/redhat-release ] ; then
- DIST="`cat /etc/redhat-release | sed 's/\ (.*)//'`"
+ DIST="$(cat /etc/redhat-release | sed 's/\ (.*)//')"
elif [ -f /etc/SuSE-release ] ; then
- DIST="`cat /etc/SuSE-release | tr '\n' ' ' | sed 's/\
VERSION.*//' | sed 's/\ (.*)//'`"
+ DIST="$(cat /etc/SuSE-release | tr '\n' ' ' | sed 's/\
VERSION.*//' | sed 's/\ (.*)//')"
elif [ -f /etc/debian_version ] ; then
- DIST="`echo Debian` `cat /etc/debian_version | sed 's/\//-/'`"
+ DIST="$(echo Debian) $(cat /etc/debian_version | sed 's/\//-/')"
fi
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 9 Jan 2014 17:36:08 -0000 1.29
+++ .cvsignore 26 Apr 2014 18:18:17 -0000 1.30
@@ -1 +1 @@
-qmc2-0.42.tar.bz2
+qmc2-0.43.tar.bz2
qmc2-ini.patch:
qmc2.ini.template | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/qmc2-ini.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qmc2-ini.patch 19 Sep 2013 18:55:10 -0000 1.13
+++ qmc2-ini.patch 26 Apr 2014 18:18:17 -0000 1.14
@@ -1,10 +1,12 @@
diff -up qmc2-0.38/sdlmame/inst/qmc2.ini.template.ini
qmc2-0.38/sdlmame/inst/qmc2.ini.template
--- qmc2-0.38/sdlmame/inst/qmc2.ini.template.ini 2013-01-06 18:07:34.000000000 +0100
+++ qmc2-0.38/sdlmame/inst/qmc2.ini.template 2013-01-13 11:42:47.054553069 +0100
-@@ -1,9 +1,26 @@
+@@ -1,9 +1,28 @@
[Frontend]
qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmame\Gamelist\UseCatverIni=true
++qmc2-sdlmame\FilesAndDirectories\MameHistoryDat=DATADIR/mame/history.dat
++qmc2-sdlmame\FilesAndDirectories\MameInfoDat=DATADIR/mame/mameinfo.dat
qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+qmc2-sdlmess\Gamelist\UseCategoryIni=true
qmc2-sdlume\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
@@ -28,13 +30,11 @@
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -18,8 +35,28 @@ FilesAndDirectories\SoftwareNotesFolder=
+@@ -18,8 +35,26 @@ FilesAndDirectories\SoftwareNotesFolder=
FilesAndDirectories\SoftwareNotesTemplate=DATADIR/qmc2/swn/template.html
FilesAndDirectories\SystemNotesFolder=DATADIR/qmc2/gmn/
FilesAndDirectories\SystemNotesTemplate=DATADIR/qmc2/gmn/template.html
+FilesAndDirectories\ExecutableFile=/usr/bin/mame
-+FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
+FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
+FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
@@ -57,15 +57,14 @@
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -34,6 +71,11 @@ FilesAndDirectories\SoftwareNotesFolder=
+@@ -34,6 +71,10 @@ FilesAndDirectories\SoftwareNotesFolder=
FilesAndDirectories\SoftwareNotesTemplate=DATADIR/qmc2/swn/template.html
FilesAndDirectories\SystemNotesFolder=DATADIR/qmc2/gmn/
FilesAndDirectories\SystemNotesTemplate=DATADIR/qmc2/gmn/template.html
+FilesAndDirectories\ExecutableFile=/usr/bin/mess
+FilesAndDirectories\GameInfoDB=DATADIR/mess/sysinfo.dat
-+FilesAndDirectories\EmuInfoDB=/usr/share/mess/messinfo.dat
++FilesAndDirectories\EmuInfoDB=DATADIR/mess/messinfo.dat
+FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
-+FilesAndDirectories\CategoryIni=/usr/share/mess/category.ini
[UME]
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLUME/template.xml
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/qmc2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qmc2.spec 9 Jan 2014 17:36:08 -0000 1.43
+++ qmc2.spec 26 Apr 2014 18:18:17 -0000 1.44
@@ -1,5 +1,5 @@
Name: qmc2
-Version: 0.42
+Version: 0.43
Release: 1%{?dist}
Summary: M.A.M.E./M.E.S.S./U.M.E. Catalog / Launcher II, common files
@@ -7,6 +7,7 @@
URL: http://qmc2.arcadehits.net/
Source0: http://downloads.sourceforge.net/qmc2/%{name}-%{version}.tar.bz2
Patch1: qmc2-ini.patch
+Patch2: qmc2-0.43-os-detect.patch
BuildRequires: desktop-file-utils
BuildRequires: libXmu-devel
@@ -27,6 +28,7 @@
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mame
Provides: %{name}-binary%{?_isa} = %{version}-%{release}
+Provides: bundled(lzma-sdk) = 9.22
%description sdlmame
QMC2 is a Qt4 based UNIX frontend for MAME and MESS. This package
@@ -38,6 +40,7 @@
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mess
Provides: %{name}-binary%{?_isa} = %{version}-%{release}
+Provides: bundled(lzma-sdk) = 9.22
%description sdlmess
QMC2 is a Qt4 based UNIX frontend for MAME and MESS. This package
@@ -56,11 +59,10 @@
%setup -qcT
tar -xjf %{SOURCE0}
mv %{name} sdlmame
-ln -s Fedora.cfg sdlmame/arch/Linux/Fedora_release_21.cfg
tar -xjf %{SOURCE0}
mv %{name} sdlmess
-ln -s Fedora.cfg sdlmess/arch/Linux/Fedora_release_21.cfg
%patch1 -p1 -b .ini
+%patch2 -p1 -b .os-detect
chmod 644 sdlmame/tools/qchdman/scriptwidget.*
@@ -137,6 +139,11 @@
%changelog
+* Sat Apr 26 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.43-1
+- Updated to 0.43
+- Updated the ini patch to use category.ini supplied with qmc2 by default
+- Added bundled(lzma-sdk) = 9.22 to Provides
+
* Thu Jan 09 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.42-1
- Updated to 0.42
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-20/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 9 Jan 2014 17:36:08 -0000 1.29
+++ sources 26 Apr 2014 18:18:17 -0000 1.30
@@ -1 +1 @@
-516f333848948c16460060e314e6befb qmc2-0.42.tar.bz2
+45edb028f620617f5d24b209e913cb2a qmc2-0.43.tar.bz2