rpms/qmc2/devel qmc2-0.53-docdestdir.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 qmc2-ini.patch, 1.15, 1.16 qmc2.spec, 1.51, 1.52 sources, 1.37, 1.38

Julian Sikorski belegdol at rpmfusion.org
Tue Jul 14 21:27:28 CEST 2015 

Author: belegdol

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

Modified Files:
	.cvsignore qmc2-ini.patch qmc2.spec sources 
Added Files:
	qmc2-0.53-docdestdir.patch 
Log Message:
* Tue Jul 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.53-1
- Updated to 0.53
- Dropped -sdlmess subpackage
- Added man pages
- Cleaned up the spec file slightly
- Updated the default configuration


qmc2-0.53-docdestdir.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qmc2-0.53-docdestdir.patch ---
diff -up qmc2/Makefile.docdestdir qmc2/Makefile
--- qmc2/Makefile.docdestdir	2015-07-07 23:25:49.911217482 +0200
+++ qmc2/Makefile	2015-07-07 23:24:57.125638148 +0200
@@ -1480,8 +1480,8 @@ man-clean:
 doc-install: man-install
 man-install:
 	@$(ECHO) "Installing man-pages to $(MAN_DIR)/man6"
-	@$(MKDIR) $(MAN_DIR)/man6
-	@$(RSYNC) --exclude '*svn*' ./data/doc/man/*.gz $(MAN_DIR)/man6/
+	@$(MKDIR) $(DESTDIR)$(MAN_DIR)/man6
+	@$(RSYNC) --exclude '*svn*' ./data/doc/man/*.gz $(DESTDIR)$(MAN_DIR)/man6/
 endif
 
 # process translations


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	31 Mar 2015 17:25:33 -0000	1.37
+++ .cvsignore	14 Jul 2015 19:27:27 -0000	1.38
@@ -1 +1 @@
-qmc2-0.50.tar.bz2
+qmc2-0.53.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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qmc2-ini.patch	31 Mar 2015 17:25:33 -0000	1.15
+++ qmc2-ini.patch	14 Jul 2015 19:27:27 -0000	1.16
@@ -1,70 +1,44 @@
-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,28 @@
- [Frontend]
+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-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/
++FilesAndDirectories\MameHistoryDat=DATADIR/mame/history.dat
++FilesAndDirectories\MessSysinfoDat=DATADIR/mame/history.dat
++FilesAndDirectories\MameInfoDat=DATADIR/mame/mameinfo.dat
++FilesAndDirectories\MessInfoDat=DATADIR/mame/messinfo.dat
  
  [MAME]
 +Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
++Configuration\Global\hashpath=DATADIR/mame/hash
 +Configuration\Global\samplepath=DATADIR/mame/samples
 +Configuration\Global\artpath="DATADIR/mame/artwork;DATADIR/mame/effects"
-+Configuration\Global\cheatpath=DATADIR/mame/cheat
 +Configuration\Global\ctrlrpath=DATADIR/mame/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mame/cfg
-+Configuration\Global\comment_directory=$HOME/.mame/comments
-+Configuration\Global\diff_directory=$HOME/.mame/diff
++Configuration\Global\fontpath=DATADIR/mame/fonts
++Configuration\Global\cheatpath=DATADIR/mame/cheat
++Configuration\Global\crosshairpath=DATADIR/mame/crosshair
 +Configuration\Global\inipath="$HOME/.mame/ini;/etc/mame"
-+Configuration\Global\input_directory=$HOME/.mame/inp
-+Configuration\Global\memcard_directory=$HOME/.mame/memcard
++Configuration\Global\cfg_directory=$HOME/.mame/cfg
 +Configuration\Global\nvram_directory=$HOME/.mame/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mame/snap
++Configuration\Global\input_directory=$HOME/.mame/inp
 +Configuration\Global\state_directory=$HOME/.mame/sta
++Configuration\Global\snapshot_directory=$HOME/.mame/snap
++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\PreviewDirectory=DATADIR/qmc2/prv/
  FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -18,8 +35,26 @@ FilesAndDirectories\SoftwareNotesFolder=
+@@ -18,6 +39,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/mame
 +FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
 +FilesAndDirectories\CatverIni=DATADIR/mame/Catver.ini
++FilesAndDirectories\CategoryIni=DATADIR/qmc2/cat/category.ini
  
  [MESS]
-+Configuration\Global\rompath="DATADIR/mess/roms;DATADIR/mess/chds"
-+Configuration\Global\samplepath=DATADIR/mess/samples
-+Configuration\Global\artpath="DATADIR/mess/artwork;DATADIR/mess/effects"
-+Configuration\Global\cheatpath=DATADIR/mess/cheat
-+Configuration\Global\ctrlrpath=DATADIR/mess/ctrlr
-+Configuration\Global\cfg_directory=$HOME/.mess/cfg
-+Configuration\Global\comment_directory=$HOME/.mess/comments
-+Configuration\Global\diff_directory=$HOME/.mess/diff
-+Configuration\Global\inipath="$HOME/.mess/ini;/etc/mess"
-+Configuration\Global\input_directory=$HOME/.mess/inp
-+Configuration\Global\memcard_directory=$HOME/.mess/memcard
-+Configuration\Global\nvram_directory=$HOME/.mess/nvram
-+Configuration\Global\snapshot_directory=$HOME/.mess/snap
-+Configuration\Global\state_directory=$HOME/.mess/sta
-+Configuration\Global\video=opengl
  FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/SDLMESS/template.xml
- FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
- FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
-@@ -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/mame/history.dat
-+FilesAndDirectories\EmuInfoDB=DATADIR/mess/messinfo.dat
-+FilesAndDirectories\SoftwareInfoDB=DATADIR/mame/history.dat
- 
- [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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- qmc2.spec	31 Mar 2015 17:25:33 -0000	1.51
+++ qmc2.spec	14 Jul 2015 19:27:27 -0000	1.52
@@ -1,12 +1,13 @@
 Name:           qmc2
-Version:        0.50
+Version:        0.53
 Release:        1%{?dist}
-Summary:        M.A.M.E./M.E.S.S./U.M.E. Catalog / Launcher II, common files
+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
-Patch1:         qmc2-ini.patch
+Patch0:         %{name}-%{version}-docdestdir.patch
+Patch1:         %{name}-ini.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  libXmu-devel
@@ -15,35 +16,14 @@
 BuildRequires:  rsync
 BuildRequires:  SDL-devel
 Requires:       games-menus
-Requires:       %{name}-binary%{?_isa} = %{version}-%{release}
-
-%description
-QMC2 is a Qt4 based UNIX frontend for MAME and MESS. This package
-contains the common files.
-
-
-%package sdlmame
-Summary:        M.A.M.E. Catalog / Launcher II
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       mame
-Provides:       %{name}-binary%{?_isa} = %{version}-%{release}
 Provides:       bundled(lzma-sdk) = 9.22
+Provides:       %{name}-sdlmame = %{version}-%{release}
+Provides:       %{name}-sdlmess = %{version}-%{release}
+Obsoletes:      %{name}-sdlmame < 0.50-2
+Obsoletes:      %{name}-sdlmess < 0.50-2
 
-%description sdlmame
-QMC2 is a Qt4 based UNIX frontend for MAME and MESS. This package
-contains the parts required for MAME support.
-
-
-%package sdlmess
-Summary:        M.E.S.S. Catalog / Launcher II
-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
-contains the parts required for MESS support.
+%description
+QMC2 is a Qt4 based UNIX frontend for MAME and MESS.
 
 
 %package -n qchdman
@@ -55,51 +35,28 @@
 
 
 %prep
-%setup -qcT
-tar -xjf %{SOURCE0}
-mv %{name} sdlmame
-tar -xjf %{SOURCE0}
-mv %{name} sdlmess
-%patch1 -p1 -b .ini
-chmod 644 sdlmame/tools/qchdman/scriptwidget.*
+%setup -qn %{name}
+%patch0 -p1 -b .docdestdir
+%patch1 -p1 -b .fedora
+ln -s Fedora.cfg arch/Linux/Fedora_release_22.cfg
 
 
 %build
-pushd sdlmess
-make %{?_smp_mflags} CTIME=0 DISTCFG=1 EMULATOR=SDLMESS PRETTY=0 \
-    PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
-popd
-
-pushd sdlmame
-make %{?_smp_mflags} CTIME=0 DISTCFG=1 EMULATOR=SDLMAME PRETTY=0 \
-    PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
-
-make qchdman %{?_smp_mflags} CTIME=0 DISTCFG=1 PRETTY=0 \
-    PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
-popd
+make %{?_smp_mflags} DISTCFG=1
+make qchdman %{?_smp_mflags} DISTCFG=1
+make doc %{?_smp_mflags} DISTCFG=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd sdlmess
-make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
-    PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
-    EMULATOR=SDLMESS QT_TRANSLATION=../../qt4/translations
-popd
+make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PREFIX=%{_prefix} \
+    QT_TRANSLATION=../../qt4/translations
 
-#remove the qmc2.ini since we only need one
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/qmc2/qmc2.ini
+make qchdman-install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 PREFIX=%{_prefix} \
+    QT_TRANSLATION=../../qt4/translations
 
-pushd sdlmame
-make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
-    PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
-    EMULATOR=SDLMAME QT_TRANSLATION=../../qt4/translations
-
-make qchdman-install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 \
-    PRETTY=0 CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \
-    QT_TRANSLATION=../../qt4/translations 
-popd
+make doc-install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1 MAN_DIR=%{_mandir}
 
 #remove docs since we are installing docs in %%doc
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -107,36 +64,39 @@
 ln -s ../doc/%{name}-%{version} doc
 popd
 
+#remove the qmc2-arcade manpage as we are not building it
+rm -f $RPM_BUILD_ROOT%{_mandir}/man6/qmc2-arcade.6*
+
 #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
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/qchdman.desktop
 
 
 %files
-%doc sdlmame/data/doc/html
+%doc data/doc/html
 %config(noreplace) %{_sysconfdir}/qmc2
-%{_bindir}/runonce
-%{_datadir}/qmc2
-
-
-%files sdlmame
 %{_bindir}/qmc2
 %{_bindir}/qmc2-sdlmame
 %{_datadir}/applications/qmc2-sdlmame.desktop
-
-
-%files sdlmess
-%{_bindir}/qmc2-sdlmess
-%{_datadir}/applications/qmc2-sdlmess.desktop
-
+%{_mandir}/man6/qmc2-main-gui.6*
+%{_mandir}/man6/qmc2-sdlmame.6*
+%{_mandir}/man6/qmc2.6*
+%{_datadir}/qmc2
 
 %files -n qchdman
 %{_bindir}/qchdman
 %{_datadir}/applications/qchdman.desktop
+%{_mandir}/man6/qchdman.6*
 
 
 %changelog
+* Tue Jul 07 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.53-1
+- Updated to 0.53
+- Dropped -sdlmess subpackage
+- Added man pages
+- Cleaned up the spec file slightly
+- Updated the default configuration
+
 * Tue Mar 31 2015 Julian Sikorski <belegdol at fedoraproject.org> - 0.50-1
 - Updated to 0.50
 - Switched to use history.dat instead of sysinfo.dat by default


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Mar 2015 17:25:33 -0000	1.37
+++ sources	14 Jul 2015 19:27:27 -0000	1.38
@@ -1 +1 @@
-742085b3cbab5801b0331f488f8eff1c  qmc2-0.50.tar.bz2
+62957861e2f61643c93360d36c602f10  qmc2-0.53.tar.bz2

More information about the rpmfusion-commits mailing list