rpms/qmc2/devel .cvsignore, 1.38, 1.39 qmc2-ini.patch, 1.16, 1.17 qmc2.spec, 1.52, 1.53 sources, 1.38, 1.39

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/qmc2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29277

Modified Files:
	.cvsignore qmc2-ini.patch qmc2.spec sources 
Log Message:
* Thu Jul 30 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.54-1
- Updated to 0.54
- Dropped upstreamed patch
- Updated the -ini patch



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	14 Jul 2015 19:27:27 -0000	1.38
+++ .cvsignore	30 Jul 2015 21:35:03 -0000	1.39
@@ -1 +1 @@
-qmc2-0.53.tar.bz2
+qmc2-0.54.tar.bz2

qmc2-ini.patch:
 qmc2.ini.template |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qmc2-ini.patch	14 Jul 2015 19:27:27 -0000	1.16
+++ qmc2-ini.patch	30 Jul 2015 21:35:03 -0000	1.17
@@ -1,10 +1,9 @@
 diff -up qmc2/inst/qmc2.ini.template.fedora qmc2/inst/qmc2.ini.template
---- qmc2/inst/qmc2.ini.template.fedora	2014-03-13 18:05:21.010845945 +0100
-+++ qmc2/inst/qmc2.ini.template	2015-07-14 21:20:45.196473431 +0200
-@@ -2,8 +2,29 @@
- qmc2-sdlmame\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlmess\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
- qmc2-sdlume\FilesAndDirectories\DataDirectory=DATADIR/qmc2/
+--- qmc2/inst/qmc2.ini.template.fedora	2015-07-30 23:30:57.773647889 +0200
++++ qmc2/inst/qmc2.ini.template	2015-07-30 23:33:14.933219911 +0200
+@@ -1,7 +1,28 @@
+ [Frontend]
+ FilesAndDirectories\DataDirectory=DATADIR/qmc2/
 +FilesAndDirectories\MameHistoryDat=DATADIR/mame/history.dat
 +FilesAndDirectories\MessSysinfoDat=DATADIR/mame/history.dat
 +FilesAndDirectories\MameInfoDat=DATADIR/mame/mameinfo.dat
@@ -28,10 +27,10 @@
 +Configuration\Global\diff_directory=$HOME/.mame/diff
 +Configuration\Global\comment_directory=$HOME/.mame/comments
 +Configuration\Global\video=opengl
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template.xml
+ FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMAME/template-SDL2.xml
  FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
  FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -18,6 +39,10 @@ FilesAndDirectories\SoftwareNotesFolder=
+@@ -16,3 +37,7 @@ FilesAndDirectories\SoftwareNotesFolder=
  FilesAndDirectories\SoftwareNotesTemplate=DATADIR/qmc2/swn/template.html
  FilesAndDirectories\SystemNotesFolder=DATADIR/qmc2/gmn/
  FilesAndDirectories\SystemNotesTemplate=DATADIR/qmc2/gmn/template.html
@@ -39,6 +38,3 @@
 +FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
 +FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
 +FilesAndDirectories\CategoryIni=DATADIR/qmc2/cat/category.ini
- 
- [MESS]
- FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml


Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- qmc2.spec	14 Jul 2015 19:27:27 -0000	1.52
+++ qmc2.spec	30 Jul 2015 21:35:03 -0000	1.53
@@ -1,12 +1,11 @@
 Name:           qmc2
-Version:        0.53
+Version:        0.54
 Release:        1%{?dist}
 Summary:        M.A.M.E. Catalog / Launcher II
 
 License:        GPLv2
 URL:            http://qmc2.arcadehits.net/
 Source0:        http://downloads.sourceforge.net/qmc2/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-%{version}-docdestdir.patch
 Patch1:         %{name}-ini.patch
 
 BuildRequires:  desktop-file-utils
@@ -36,9 +35,7 @@
 
 %prep
 %setup -qn %{name}
-%patch0 -p1 -b .docdestdir
 %patch1 -p1 -b .fedora
-ln -s Fedora.cfg arch/Linux/Fedora_release_22.cfg
 
 
 %build
@@ -90,6 +87,11 @@
 
 
 %changelog
+* Thu Jul 30 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.54-1
+- Updated to 0.54
+- Dropped upstreamed patch
+- Updated the -ini patch
+
 * Tue Jul 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.53-1
 - Updated to 0.53
 - Dropped -sdlmess subpackage


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	14 Jul 2015 19:27:27 -0000	1.38
+++ sources	30 Jul 2015 21:35:03 -0000	1.39
@@ -1 +1 @@
-62957861e2f61643c93360d36c602f10  qmc2-0.53.tar.bz2
+af888824c7692a5517f2873588c3df04  qmc2-0.54.tar.bz2