From d1e8c127274c181a8590634d5ce31f04832dae07 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 11 Jan 2008 07:32:09 +0000
Subject: use dists/engine-data for data files; include lure.dat

svn-id: r30400
---
 dists/redhat/scummvm.spec    | 11 +++++------
 dists/redhat/scummvm.spec.in | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index fb5a8d929e..73686956c2 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -18,9 +18,6 @@ Url             : http://www.scummvm.org
 Source		: %{name}-%{version}.tar.bz2
 Source1		: libmad-0.15.1b.tar.bz2
 Source2		: mpeg2dec-0.4.1.tar.bz2
-Source3		: kyra.dat
-Source4		: queen.tbl
-Source5		: sky.cpt
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -64,9 +61,10 @@ install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
 install -m644 -D gui/themes/modern.ini %{buildroot}%{_datadir}/scummvm/modern.ini
 install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/scummvm/modern.zip
 install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic
-install -m644 -D %{_sourcedir}/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat
-install -m644 -D %{_sourcedir}/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl
-install -m644 -D %{_sourcedir}/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt
+install -m644 -D dists/engine-data/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat
+install -m644 -D dists/engine-data/lure.dat %{buildroot}%{_datadir}/scummvm/lure.dat
+install -m644 -D dists/engine-data/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl
+install -m644 -D dists/engine-data/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -86,6 +84,7 @@ rm -Rf ${RPM_BUILD_ROOT}
 %{_datadir}/scummvm/kyra.dat
 %{_datadir}/scummvm/queen.tbl
 %{_datadir}/scummvm/sky.cpt
+%{_datadir}/scummvm/lure.dat
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index 77e4636baa..83e601f9f2 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -18,9 +18,6 @@ Url             : http://www.scummvm.org
 Source		: %{name}-%{version}.tar.bz2
 Source1		: libmad-0.15.1b.tar.bz2
 Source2		: mpeg2dec-0.4.1.tar.bz2
-Source3		: kyra.dat
-Source4		: queen.tbl
-Source5		: sky.cpt
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -64,9 +61,10 @@ install -m644 -D icons/scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
 install -m644 -D gui/themes/modern.ini %{buildroot}%{_datadir}/scummvm/modern.ini
 install -m644 -D gui/themes/modern.zip %{buildroot}%{_datadir}/scummvm/modern.zip
 install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic
-install -m644 -D %{_sourcedir}/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat
-install -m644 -D %{_sourcedir}/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl
-install -m644 -D %{_sourcedir}/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt
+install -m644 -D dists/engine-data/kyra.dat %{buildroot}%{_datadir}/scummvm/kyra.dat
+install -m644 -D dists/engine-data/lure.dat %{buildroot}%{_datadir}/scummvm/lure.dat
+install -m644 -D dists/engine-data/queen.tbl %{buildroot}%{_datadir}/scummvm/queen.tbl
+install -m644 -D dists/engine-data/sky.cpt %{buildroot}%{_datadir}/scummvm/sky.cpt
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -86,6 +84,7 @@ rm -Rf ${RPM_BUILD_ROOT}
 %{_datadir}/scummvm/kyra.dat
 %{_datadir}/scummvm/queen.tbl
 %{_datadir}/scummvm/sky.cpt
+%{_datadir}/scummvm/lure.dat
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.3