April 2014 - rpmfusion-commits

rpms/qmc2/F-19 qmc2-0.43-os-detect.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 qmc2-ini.patch, 1.13, 1.14 qmc2.spec, 1.43, 1.44 sources, 1.29, 1.30

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/qmc2/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17318 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-19/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 9 Jan 2014 17:36:14 -0000 1.29 +++ .cvsignore 26 Apr 2014 18:18:23 -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-19/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:16 -0000 1.13 +++ qmc2-ini.patch 26 Apr 2014 18:18:23 -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-19/qmc2.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- qmc2.spec 9 Jan 2014 17:36:14 -0000 1.43 +++ qmc2.spec 26 Apr 2014 18:18:23 -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-19/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 9 Jan 2014 17:36:14 -0000 1.29 +++ sources 26 Apr 2014 18:18:23 -0000 1.30 @@ -1 +1 @@ -516f333848948c16460060e314e6befb qmc2-0.42.tar.bz2 +45edb028f620617f5d24b209e913cb2a qmc2-0.43.tar.bz2

10 years

1
0
0 / 0

rpms/qmc2/F-20 qmc2-0.43-os-detect.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 qmc2-ini.patch, 1.13, 1.14 qmc2.spec, 1.43, 1.44 sources, 1.29, 1.30

by Julian Sikorski

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

10 years

1
0
0 / 0

rpms/qmc2/devel qmc2-0.43-os-detect.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 qmc2-ini.patch, 1.13, 1.14 qmc2.spec, 1.43, 1.44 sources, 1.29, 1.30

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/qmc2/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17096 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/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 9 Jan 2014 17:36:01 -0000 1.29 +++ .cvsignore 26 Apr 2014 18:18:11 -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/devel/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:11 -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/devel/qmc2.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- qmc2.spec 9 Jan 2014 17:36:01 -0000 1.43 +++ qmc2.spec 26 Apr 2014 18:18:11 -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/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 9 Jan 2014 17:36:02 -0000 1.29 +++ sources 26 Apr 2014 18:18:11 -0000 1.30 @@ -1 +1 @@ -516f333848948c16460060e314e6befb qmc2-0.42.tar.bz2 +45edb028f620617f5d24b209e913cb2a qmc2-0.43.tar.bz2

10 years

1
0
0 / 0

rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.156, 1.157 nvidia_3.14_kernel.patch, 1.4, NONE

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13025 Modified Files: nvidia-kmod.spec Removed Files: nvidia_3.14_kernel.patch Log Message: * Sat Apr 26 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.12-3 - remove kernel patch Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- nvidia-kmod.spec 9 Apr 2014 17:37:54 -0000 1.156 +++ nvidia-kmod.spec 26 Apr 2014 15:47:25 -0000 1.157 @@ -9,7 +9,7 @@ Epoch: 1 Version: 337.12 # Taken over by kmodtool -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,7 +25,6 @@ Source0: nvidia-kmod-data-%{version}.tar.xz Patch0: nv-linux-arm.patch -Patch1: nvidia_3.14_kernel.patch Source11: nvidia-kmodtool-excludekernel-filterfile @@ -55,7 +54,6 @@ do pushd nvidiapkg-${arch} %patch0 -p1 -%patch1 -p1 popd done @@ -99,6 +97,9 @@ %changelog +* Sat Apr 26 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.12-3 +- remove kernel patch + * Wed Apr 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:337.12-2 - Avoid lpae kvarriant on arm --- nvidia_3.14_kernel.patch DELETED ---

10 years

1
0
0 / 0

rpms/xtables-addons-kmod/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 xtables-addons-kmod.spec, 1.35, 1.36

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xtables-addons-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11729/devel Modified Files: .cvsignore sources xtables-addons-kmod.spec Log Message: Update to 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 12 Jan 2014 20:53:36 -0000 1.13 +++ .cvsignore 26 Apr 2014 15:05:25 -0000 1.14 @@ -1 +1 @@ -xtables-addons-2.4.tar.xz +xtables-addons-2.5.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 12 Jan 2014 16:58:38 -0000 1.14 +++ sources 26 Apr 2014 15:05:25 -0000 1.15 @@ -1 +1 @@ -b2dfe9a37f328d3a3f6fe402e0596a2c xtables-addons-2.4.tar.xz +335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz Index: xtables-addons-kmod.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xtables-addons-kmod.spec 12 Jan 2014 20:45:17 -0000 1.35 +++ xtables-addons-kmod.spec 26 Apr 2014 15:05:25 -0000 1.36 @@ -7,7 +7,7 @@ Name: xtables-addons-kmod Summary: Kernel module (kmod) for xtables-addons -Version: 2.4 +Version: 2.5 Release: 1%{?dist} License: GPLv2 Group: System Environment/Kernel @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1 +- Update to 2.5 + * Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4-1 - Update to 2.4

10 years

1
0
0 / 0

rpms/xtables-addons-kmod/F-20 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 xtables-addons-kmod.spec, 1.52, 1.53

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xtables-addons-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11729/F-20 Modified Files: .cvsignore sources xtables-addons-kmod.spec Log Message: Update to 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-20/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Jun 2013 15:28:54 -0000 1.12 +++ .cvsignore 26 Apr 2014 15:05:25 -0000 1.13 @@ -1 +1 @@ -xtables-addons-2.3.tar.xz +xtables-addons-2.5.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-20/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Jun 2013 15:28:54 -0000 1.13 +++ sources 26 Apr 2014 15:05:25 -0000 1.14 @@ -1 +1 @@ -7d942729c365a549513511061f74c3e3 xtables-addons-2.3.tar.xz +335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz Index: xtables-addons-kmod.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-20/xtables-addons-kmod.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- xtables-addons-kmod.spec 26 Apr 2014 13:40:17 -0000 1.52 +++ xtables-addons-kmod.spec 26 Apr 2014 15:05:26 -0000 1.53 @@ -3,12 +3,12 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +#global buildforkernels akmod Name: xtables-addons-kmod Summary: Kernel module (kmod) for xtables-addons -Version: 2.3 -Release: 4%{?dist}.20 +Version: 2.5 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Kernel URL: http://xtables-addons.sourceforge.net @@ -59,69 +59,17 @@ export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*} make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ INSTALL_MOD_PATH=%{buildroot}%{_prefix} ext-mod-dir=%{kmodinstdir_postfix} done -chmod u+x %{buildroot}%{_prefix}/lib/modules/*/extra/*/* %{?akmod_install} %clean rm -rf %{buildroot} %changelog -* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.20 -- Rebuilt for kernel +* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1 +- Update to 2.5 -* Wed Apr 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.19 -- Rebuilt for kernel - -* Fri Apr 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.18 -- Rebuilt for kernel - -* Wed Apr 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.17 -- Rebuilt for kernel - -* Tue Mar 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.16 -- Rebuilt for kernel - -* Sun Mar 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.15 -- Rebuilt for kernel - -* Tue Mar 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.14 -- Rebuilt for kernel - -* Tue Feb 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.13 -- Rebuilt for kernel - -* Mon Feb 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.12 -- Rebuilt for kernel - -* Mon Feb 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.11 -- Rebuilt for kernel - -* Sat Feb 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.10 -- Rebuilt for kernel - -* Wed Feb 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.9 -- Rebuilt for kernel - -* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.8 -- Rebuilt for kernel - -* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.7 -- Rebuilt for kernel - -* Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.6 -- Rebuilt for kernel - -* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.5 -- Rebuilt for kernel - -* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.4 -- Rebuilt for kernel - -* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.3 -- Rebuilt for kernel - -* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.2 -- Rebuilt for kernel +* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4-1 +- Update to 2.4 * Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.1 - Rebuilt for f20 final kernel

10 years

1
0
0 / 0

rpms/libbdplus/devel libbdplus-0.1.0-libgcrypt_1.6_support.patch, NONE, 1.1 libbdplus.spec, 1.2, 1.3

by Xavier Bachelot

Author: xavierb Update of /cvs/free/rpms/libbdplus/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11317 Modified Files: libbdplus.spec Added Files: libbdplus-0.1.0-libgcrypt_1.6_support.patch Log Message: Add patch for libgcrypt 1.6 support libbdplus-0.1.0-libgcrypt_1.6_support.patch: trap.c | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) --- NEW FILE libbdplus-0.1.0-libgcrypt_1.6_support.patch --- >From a47d4a95762d960653599d83281d4ede92663b99 Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz <rraptorr(a)nails.eu.org> Date: Thu, 30 Jan 2014 11:31:17 +0200 Subject: [PATCH] Gcrypt 1.6 support Similar changes as required by libaacs. Works fine with both gcrypt 1.5.x and 1.6.x. --- src/libbdplus/bdsvm/trap.c | 49 ++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/src/libbdplus/bdsvm/trap.c b/src/libbdplus/bdsvm/trap.c index 213c2a4..d97f920 100644 --- a/src/libbdplus/bdsvm/trap.c +++ b/src/libbdplus/bdsvm/trap.c @@ -436,7 +436,16 @@ uint32_t TRAP_PrivateKey(bdplus_config_t *config, uint32_t keyID, uint8_t *dst, /* Build an s-expression for the hash */ gcry_sexp_build(&sexp_data, NULL, "(data" +#if defined(GCRYPT_VERSION_NUMBER) && GCRYPT_VERSION_NUMBER >= 0x010600 + /* + * For some reason gcrypt 1.6.0 + * requires 'param' flag here and not + * in key, probably a bug. + */ + " (flags raw param)" +#else " (flags raw)" +#endif " (value %m))", mpi_hash ); @@ -472,35 +481,35 @@ uint32_t TRAP_PrivateKey(bdplus_config_t *config, uint32_t keyID, uint8_t *dst, strfmt_key = (char*)malloc( sizeof("(private-key") + sizeof("(ecdsa") + - sizeof("(p #") + sizeof(CA_q) + sizeof("#)") + - sizeof("(a #") + sizeof(CA_a) + sizeof("#)") + - sizeof("(b #") + sizeof(CA_b) + sizeof("#)") + + sizeof("(p #00") + sizeof(CA_q) + sizeof("#)") + + sizeof("(a #00") + sizeof(CA_a) + sizeof("#)") + + sizeof("(b #00") + sizeof(CA_b) + sizeof("#)") + sizeof("(g #04") + sizeof(CA_x_G) + sizeof(CA_y_G) + sizeof("#)") + - sizeof("(n #") + sizeof(CA_n) + sizeof("#)") + + sizeof("(n #00") + sizeof(CA_n) + sizeof("#)") + sizeof("(q #04") + strlen(CA_x_Q0) + strlen(CA_y_Q0) + sizeof("#)") + - sizeof("(d #") + strlen(CA_d0) + sizeof("#)))") + 1); + sizeof("(d #00") + strlen(CA_d0) + sizeof("#)))") + 1); sprintf(strfmt_key, "(private-key" "(ecdsa" - "(p #%s#)" - "(a #%s#)" - "(b #%s#)" + "(p #00%s#)" + "(a #00%s#)" + "(b #00%s#)" "(g #04" "%s" "%s" "#)" - "(n #%s#)" + "(n #00%s#)" "(q #04" "%s" "%s" "#)" - "(d #%s#)))", + "(d #00%s#)))", CA_q, CA_a, CA_b, @@ -517,35 +526,35 @@ uint32_t TRAP_PrivateKey(bdplus_config_t *config, uint32_t keyID, uint8_t *dst, strfmt_key = (char*)malloc( sizeof("(private-key") + sizeof("(ecdsa") + - sizeof("(p #") + sizeof(CA_q) + sizeof("#)") + - sizeof("(a #") + sizeof(CA_a) + sizeof("#)") + - sizeof("(b #") + sizeof(CA_b) + sizeof("#)") + + sizeof("(p #00") + sizeof(CA_q) + sizeof("#)") + + sizeof("(a #00") + sizeof(CA_a) + sizeof("#)") + + sizeof("(b #00") + sizeof(CA_b) + sizeof("#)") + sizeof("(g #04") + sizeof(CA_x_G) + sizeof(CA_y_G) + sizeof("#)") + - sizeof("(n #") + sizeof(CA_n) + sizeof("#)") + + sizeof("(n #00") + sizeof(CA_n) + sizeof("#)") + sizeof("(q #04") + strlen(CA_x_Q1) + strlen(CA_y_Q1) + sizeof("#)") + - sizeof("(d #") + strlen(CA_d1) + sizeof("#)))") + 1); + sizeof("(d #00") + strlen(CA_d1) + sizeof("#)))") + 1); sprintf(strfmt_key, "(private-key" "(ecdsa" - "(p #%s#)" - "(a #%s#)" - "(b #%s#)" + "(p #00%s#)" + "(a #00%s#)" + "(b #00%s#)" "(g #04" "%s" "%s" "#)" - "(n #%s#)" + "(n #00%s#)" "(q #04" "%s" "%s" "#)" - "(d #%s#)))", + "(d #00%s#)))", CA_q, CA_a, CA_b, -- 1.7.10.4 Index: libbdplus.spec =================================================================== RCS file: /cvs/free/rpms/libbdplus/devel/libbdplus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libbdplus.spec 26 Apr 2014 13:50:04 -0000 1.2 +++ libbdplus.spec 26 Apr 2014 15:02:00 -0000 1.3 @@ -1,10 +1,12 @@ Name: libbdplus Version: 0.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open implementation of BD+ protocol License: LGPLv2+ URL: http://www.videolan.org/developers/libbdplus.html Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... +# http://git.videolan.org/gitweb.cgi/libbdplus.git/?p=libbdplus.git;a=patch... +Patch0: libbdplus-0.1.0-libgcrypt_1.6_support.patch BuildRequires: libgcrypt-devel BuildRequires: libaacs-devel >= 0.7.0 @@ -27,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .libgcrypt-1.6 %build @@ -55,6 +58,9 @@ %changelog +* Sat Apr 26 2014 Xavier Bachelot <xavier(a)bachelot.org> - 0.1.0-4 +- Add patch for libgcrypt 1.6 support. + * Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-3 - Rebuilt for libgcrypt

10 years

1
0
0 / 0

rpms/xtables-addons/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 xtables-addons.spec, 1.20, 1.21

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xtables-addons/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11234/devel Modified Files: .cvsignore sources xtables-addons.spec Log Message: Update to 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 12 Jan 2014 16:45:48 -0000 1.13 +++ .cvsignore 26 Apr 2014 15:00:51 -0000 1.14 @@ -1 +1 @@ -xtables-addons-2.4.tar.xz +xtables-addons-2.5.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 12 Jan 2014 16:45:48 -0000 1.14 +++ sources 26 Apr 2014 15:00:51 -0000 1.15 @@ -1 +1 @@ -b2dfe9a37f328d3a3f6fe402e0596a2c xtables-addons-2.4.tar.xz +335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xtables-addons.spec 12 Jan 2014 16:45:48 -0000 1.20 +++ xtables-addons.spec 26 Apr 2014 15:00:51 -0000 1.21 @@ -1,6 +1,6 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 2.4 +Version: 2.5 Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 @@ -91,6 +91,9 @@ %{_mandir}/man?/* %changelog +* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1 +- Update to 2.5 + * Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4-1 - Update to 2.4

10 years

1
0
0 / 0

rpms/xtables-addons/F-20 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 xtables-addons.spec, 1.19, 1.20

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/xtables-addons/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11234/F-20 Modified Files: .cvsignore sources xtables-addons.spec Log Message: Update to 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-20/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Jun 2013 15:30:58 -0000 1.12 +++ .cvsignore 26 Apr 2014 15:00:51 -0000 1.13 @@ -1 +1 @@ -xtables-addons-2.3.tar.xz +xtables-addons-2.5.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-20/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Jun 2013 15:30:58 -0000 1.13 +++ sources 26 Apr 2014 15:00:51 -0000 1.14 @@ -1 +1 @@ -7d942729c365a549513511061f74c3e3 xtables-addons-2.3.tar.xz +335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz Index: xtables-addons.spec =================================================================== RCS file: /cvs/free/rpms/xtables-addons/F-20/xtables-addons.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xtables-addons.spec 18 Jun 2013 15:30:58 -0000 1.19 +++ xtables-addons.spec 26 Apr 2014 15:00:51 -0000 1.20 @@ -1,12 +1,12 @@ Name: xtables-addons Summary: Extensions targets and matches for iptables -Version: 2.3 +Version: 2.5 Release: 1%{?dist} # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2 License: GPLv2 and LGPLv2 Group: System Environment/Base URL: http://xtables-addons.sourceforge.net -Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtable... +Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtable... Source1: ipset.init Source2: ipset-config BuildRequires: iptables-devel >= 1.4.5 @@ -18,7 +18,7 @@ # This is for /sbin/service Requires(preun): initscripts Requires(postun): initscripts -Requires: ipset >= 6.11 +Requires: ipset >= 6.11 Obsoletes: %{name}-devel < 1.27-1 %description @@ -91,6 +91,12 @@ %{_mandir}/man?/* %changelog +* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1 +- Update to 2.5 + +* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.4-1 +- Update to 2.4 + * Tue Jun 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-1 - Update to 2.3

10 years

1
0
0 / 0

rpms/libaacs/devel libaacs-0.7.0-libgcrypt_1.6_support.patch, NONE, 1.1 libaacs.spec, 1.13, 1.14

by Xavier Bachelot

Author: xavierb Update of /cvs/free/rpms/libaacs/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10656 Modified Files: libaacs.spec Added Files: libaacs-0.7.0-libgcrypt_1.6_support.patch Log Message: - Add patch for libgcrypt 1.6 support. - Tweak the Release: tag to accomodate rpmdev-bumpspec. - Modernize specfile. libaacs-0.7.0-libgcrypt_1.6_support.patch: ChangeLog | 2 ++ src/libaacs/crypto.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) --- NEW FILE libaacs-0.7.0-libgcrypt_1.6_support.patch --- >From cbc200ffc454b142f5def611cac607997f7983e5 Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz <rraptorr(a)nails.eu.org> Date: Wed, 25 Dec 2013 20:20:34 +0100 Subject: [PATCH] Support gcrypt 1.6.0 There seems to be a slight change in S-expressions (fortunately backward compatible). There is also additional flag needed in rather strange place (data section instead of key section), most probably a bug in gcrypt. Decrypting a 350MB file with gcrypt 1.5 takes around 4 seconds on Core Quad Q9450 2.66GHz while with gcrypt 1.6 around 2.8s (the processor does not support AES-NI). --- ChangeLog | 2 ++ src/libaacs/crypto.c | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c2a9ad..4f0c8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ + - Add support for gcrypt 1.6.0. + 2013-12-18: Version 0.7.0 - Add aacs_get_device_binding_id() and aacs_get_device_nonce(). - Add aacs_get_mk(). diff --git a/src/libaacs/crypto.c b/src/libaacs/crypto.c index f1b54f8..0738f31 100644 --- a/src/libaacs/crypto.c +++ b/src/libaacs/crypto.c @@ -127,6 +127,9 @@ int crypto_init() if (!gcry_check_version(GCRYPT_VERSION)) { crypto_init_check = 0; } + if(GCRYPT_DEBUG) { + gcry_control(GCRYCTL_SET_DEBUG_FLAGS, 3); + } } return crypto_init_check; @@ -297,14 +300,14 @@ static gcry_error_t _aacs_sexp_key(gcry_sexp_t *p_sexp_key, char *strfmt = str_printf( "(%s" "(ecdsa" - "(p #"AACS_EC_p"#)" - "(a #"AACS_EC_a"#)" - "(b #"AACS_EC_b"#)" + "(p #00"AACS_EC_p"#)" + "(a #00"AACS_EC_a"#)" + "(b #00"AACS_EC_b"#)" "(g #04" AACS_EC_G_x AACS_EC_G_y "#)" - "(n #"AACS_EC_n"#)" + "(n #00"AACS_EC_n"#)" "(q #%s#)" "%s))", mpi_d ? "private-key" : "public-key", @@ -352,7 +355,16 @@ static gcry_error_t _aacs_sexp_sha1(gcry_sexp_t *p_sexp_data, GCRY_VERIFY("gcry_sexp_build", gcry_sexp_build(p_sexp_data, NULL, "(data" +#if defined(GCRYPT_VERSION_NUMBER) && GCRYPT_VERSION_NUMBER >= 0x010600 + /* + * For some reason gcrypt 1.6.0 + * requires 'param' flag here and not + * in key, probably a bug. + */ + " (flags raw param)" +#else " (flags raw)" +#endif " (value %m))", mpi_md )); -- 1.7.10.4 Index: libaacs.spec =================================================================== RCS file: /cvs/free/rpms/libaacs/devel/libaacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libaacs.spec 26 Apr 2014 13:54:01 -0000 1.13 +++ libaacs.spec 26 Apr 2014 14:52:49 -0000 1.14 @@ -1,20 +1,16 @@ -%global snapshot 0 +#global snapshot 1 %global tarball_date 20111105 %global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59 %global git_short %(echo '%{git_hash}' | cut -c -13) Name: libaacs Version: 0.7.0 -%if %{snapshot} -Release: 0.5.%{tarball_date}git%{git_short}%{?dist} -%else -Release: 3%{?dist} -%endif +Release: 4%{?snapshot:.%{tarball_date}git%{git_short}}%{?dist} Summary: Open implementation of AACS specification Group: System Environment/Libraries License: LGPLv2+ URL: http://www.videolan.org/developers/libaacs.html -%if %{snapshot} +%if 0%{?snapshot} # Use the commands below to generate a tarball. # git clone git://git.videolan.org/libaacs.git # cd libaacs @@ -23,9 +19,10 @@ %else Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... %endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# http://git.videolan.org/gitweb.cgi/libaacs.git/?p=libaacs.git;a=patch;h=c... +Patch0: libaacs-0.7.0-libgcrypt_1.6_support.patch -%if %{snapshot} +%if 0%{?snapshot} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -60,16 +57,17 @@ %prep -%if %{snapshot} +%if 0%{?snapshot} %setup -q -n %{name} %else %setup -q %endif +%patch0 -p1 -b .libgcrypt-1.6 sed -i -e 's/\r//' KEYDB.cfg %build -%if %{snapshot} +%if 0%{?snapshot} autoreconf -vif %endif %configure --disable-static @@ -79,37 +77,34 @@ %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING KEYDB.cfg ChangeLog README.txt %{_libdir}/*.so.* %files utils -%defattr(-,root,root,-) %{_bindir}/aacs_info %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/libaacs.pc %changelog +* Sat Apr 26 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.7.0-4 +- Add patch for libgcrypt 1.6 support. +- Tweak the Release: tag to accomodate rpmdev-bumpspec. +- Modernize specfile. + * Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.0-3 - Rebuilt for libgcrypt

10 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits April 2014