Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16980
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Removed Files:
qmc2-qt4.patch
Log Message:
* Mon Jul 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.3.b3
- Updated to 0.2b3
- Dropped the qt4 patch, use DISTCFG instead
- Updated the ini patch to include dat files location
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Jun 2008 20:44:31 -0000 1.2
+++ .cvsignore 7 Jul 2008 09:45:00 -0000 1.3
@@ -1 +1 @@
-qmc2-0.2.b2.tar.bz2
+qmc2-0.2.b3.tar.bz2
qmc2-ini.patch:
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2-ini.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qmc2-ini.patch 9 Jun 2008 20:44:31 -0000 1.1
+++ qmc2-ini.patch 7 Jul 2008 09:45:00 -0000 1.2
@@ -1,6 +1,10 @@
---- inst/qmc2.ini.template$HOME 2007-04-22 22:29:06.000000000 -0700
-+++ inst/qmc2.ini.template 2007-04-22 22:29:27.000000000 -0700
-@@ -3,3 +3,23 @@
+--- inst/qmc2.ini.template.ini~ 2007-10-16 15:38:29.000000000 +0200
++++ inst/qmc2.ini.template 2008-06-29 16:59:47.000000000 +0200
+@@ -1,5 +1,27 @@
+ [Frontend]
+ FilesAndDirectories\DataDirectory=DATADIR/qmc2/
++FilesAndDirectories\EmuInfoDB=DATADIR/mame/mameinfo.dat
++FilesAndDirectories\GameInfoDB=DATADIR/mame/history.dat
FilesAndDirectories\OptionsTemplateFile=DATADIR/qmc2/opt/template.xml
FilesAndDirectories\PreviewDirectory=DATADIR/qmc2/prv/
FilesAndDirectories\FlyerDirectory=DATADIR/qmc2/fly/
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qmc2.spec 9 Jun 2008 20:44:31 -0000 1.1
+++ qmc2.spec 7 Jul 2008 09:45:00 -0000 1.2
@@ -1,8 +1,8 @@
-%define beta b2
+%define beta b3
Name: qmc2
Version: 0.2
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
Summary: M.A.M.E. Catalog / Launcher II
Group: Applications/Emulators
@@ -10,7 +10,6 @@
URL:
http://www.mameworld.net/mamecat
Source0:
http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2
Source1: %{name}.png
-Patch0: qmc2-qt4.patch
Patch1: qmc2-ini.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +22,6 @@
%prep
%setup -qn %{name}
-%patch0 -p0 -b .qt4~
%patch1 -p0 -b .ini~
# create qmc2 desktop file
@@ -42,13 +40,13 @@
%build
-QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 \
+QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\
PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
%install
rm -rf $RPM_BUILD_ROOT
-QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT \
+QTDIR=%{_prefix} make install DESTDIR=$RPM_BUILD_ROOT DISTCFG=1\
CTIME=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
# remove docs since we are intalling docs in %doc
@@ -94,6 +92,11 @@
%changelog
+* Mon Jul 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.3.b3
+- Updated to 0.2b3
+- Dropped the qt4 patch, use DISTCFG instead
+- Updated the ini patch to include dat files location
+
* Sat May 10 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.2.b2
- Updated to 0.2b2
- Dropped %%{?dist} from %%changelog
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Jun 2008 20:44:31 -0000 1.2
+++ sources 7 Jul 2008 09:45:00 -0000 1.3
@@ -1 +1 @@
-43675fd06c2ed3a1fccd6125bf4ab816 qmc2-0.2.b2.tar.bz2
+136eaacb66e8661516bb5e65184e5dd1 qmc2-0.2.b3.tar.bz2
--- qmc2-qt4.patch DELETED ---