sync .spec files from 0.13 branch

svn-id: r36269

3 files changed, 16 insertions, 15 deletions

diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 564fc17274..573c573027 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 0.12.0svn
+Version		: 0.14.0svn
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
@@ -34,15 +34,14 @@ Tools for compressing ScummVM datafiles and other related tools.
 
 %build
 make
-echo -e "\t\tThis script is installed as\n\t\t"%{_datadir}/scummvm-tools/convert_dxa.sh.sample >> README
+echo -e "                This script is installed as\n                "%{_datadir}/scummvm-tools/convert_dxa.sh.sample >> README
 
 %install
 install -m755 -d %{buildroot}%{_bindir}
-install -m755 -D compress_{agos,kyra,queen,saga,scumm_bun,scumm_san,scumm_sou,sword1,sword2,touche} %{buildroot}%{_bindir}
-install -m755 -D de{kyra,scumm,sword2,gob} %{buildroot}%{_bindir}
+install -m755 -D compress_{agos,kyra,queen,saga,scumm_bun,scumm_san,scumm_sou,sword1,sword2,touche,tucker} %{buildroot}%{_bindir}
+install -m755 -D de{cine,kyra,scumm,sword2,gob} %{buildroot}%{_bindir}
 install -m755 -D encode_dxa %{buildroot}%{_bindir}/encode_dxa
-install -m755 -D extract_{agos,kyra,loom_tg16,mm_apple,mm_c64,mm_nes,scumm_mac,parallaction,zak_c64,gob_stk} %{buildroot}%{_bindir}
-install -m755 -D tools_gui %{buildroot}%{_bindir}/scummvm_tools_gui
+install -m755 -D extract_{agos,cine,kyra,loom_tg16,mm_apple,mm_c64,mm_nes,parallaction,scumm_mac,t7g_mac,zak_c64,gob_stk} %{buildroot}%{_bindir}
 install -m644 -D convert_dxa.sh %{buildroot}%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 %clean
@@ -57,7 +56,6 @@ rm -Rf ${RPM_BUILD_ROOT}
 %attr(0755,root,root)%{_bindir}/de*
 %attr(0755,root,root)%{_bindir}/extract_*
 %attr(0755,root,root)%{_bindir}/encode_dxa
-%attr(0755,root,root)%{_bindir}/scummvm_tools_gui
 %attr(0644,root,root)%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 #------------------------------------------------------------------------------
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index a0a039e015..e98c37a2cb 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -58,13 +58,14 @@ make
 install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
 install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
 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 gui/themes/scummclassic.zip %{buildroot}%{_datadir}/scummvm/scummclassic.zip
+install -m644 -D gui/themes/scummmodern.zip %{buildroot}%{_datadir}/scummvm/scummmodern.zip
 install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic
 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
+install -m644 -D dists/engine-data/drascula.dat %{buildroot}%{_datadir}/scummvm/drascula.dat
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -75,16 +76,17 @@ rm -Rf ${RPM_BUILD_ROOT}
 #------------------------------------------------------------------------------
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING COPYRIGHT
+%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYRIGHT
 %attr(0755,root,root)%{_bindir}/scummvm
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/scummvm.xpm
-%{_datadir}/scummvm/modern.*
+%{_datadir}/scummvm/scumm*.zip
 %{_datadir}/scummvm/pred.dic
 %{_datadir}/scummvm/kyra.dat
 %{_datadir}/scummvm/queen.tbl
 %{_datadir}/scummvm/sky.cpt
 %{_datadir}/scummvm/lure.dat
+%{_datadir}/scummvm/drascula.dat
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index a20777003b..1b3aebe448 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -58,13 +58,13 @@ make
 install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
 install -m644 -D dists/scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
 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 gui/themes/scummmodern.zip %{buildroot}%{_datadir}/scummvm/scummmodern.zip
 install -m644 -D dists/pred.dic %{buildroot}%{_datadir}/scummvm/pred.dic
 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
+install -m644 -D dists/engine-data/drascula.dat %{buildroot}%{_datadir}/scummvm/drascula.dat
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -75,16 +75,17 @@ rm -Rf ${RPM_BUILD_ROOT}
 #------------------------------------------------------------------------------
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING COPYRIGHT
+%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYRIGHT
 %attr(0755,root,root)%{_bindir}/scummvm
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/scummvm.xpm
-%{_datadir}/scummvm/modern.*
+%{_datadir}/scummvm/scumm*.zip
 %{_datadir}/scummvm/pred.dic
 %{_datadir}/scummvm/kyra.dat
 %{_datadir}/scummvm/queen.tbl
 %{_datadir}/scummvm/sky.cpt
 %{_datadir}/scummvm/lure.dat
+%{_datadir}/scummvm/drascula.dat
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------