Add .spec for new tools GUI.

Specifically:
include libmad,
package correct tools binaries,
use tools-1.1.0 instead of scummvm-tools-1.1.0 as directory.

svn-id: r48494

2 files changed, 18 insertions, 14 deletions

diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 150ba800f0..32fa280074 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -16,6 +16,7 @@ License		: GPL
 Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
+Source1		: libmad-0.15.1b.tar.bz2
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires	: zlib-devel
@@ -30,18 +31,19 @@ Tools for compressing ScummVM datafiles and other related tools.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -n scummvm-tools-%{version}
+%setup -q -a 1 -n tools-%{version}
 
 %build
+(cd libmad-0.15.1b; grep -v 'force-\(mem\|addr\)' configure > configure.new; mv -f configure.new configure; chmod 700 configure; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
+./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp
 make
 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,gob,kyra,queen,saga,scumm_bun,scumm_san,scumm_sou,sword1,sword2,tinsel,touche,tucker} %{buildroot}%{_bindir}
-install -m755 -D de{cine,gob,kyra,scumm,sword2} %{buildroot}%{_bindir}
-install -m755 -D encode_dxa %{buildroot}%{_bindir}/encode_dxa
-install -m755 -D extract_{agos,cine,gob_stk,kyra,loom_tg16,mm_apple,mm_c64,mm_nes,parallaction,scumm_mac,t7g_mac,zak_c64} %{buildroot}%{_bindir}
+install -m755 -D scummvm-tools{,-cli} %{buildroot}%{_bindir}
+install -m755 -D de{cine,gob,kyra,riven,scumm,sword2} %{buildroot}%{_bindir}
+install -m755 -D {construct,extract}_mohawk %{buildroot}%{_bindir}
 install -m644 -D convert_dxa.sh %{buildroot}%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 %clean
@@ -52,10 +54,10 @@ rm -Rf ${RPM_BUILD_ROOT}
 #------------------------------------------------------------------------------
 %files
 %doc README COPYING
-%attr(0755,root,root)%{_bindir}/compress_*
+%attr(0755,root,root)%{_bindir}/scummvm*
 %attr(0755,root,root)%{_bindir}/de*
 %attr(0755,root,root)%{_bindir}/extract_*
-%attr(0755,root,root)%{_bindir}/encode_dxa
+%attr(0755,root,root)%{_bindir}/construct_*
 %attr(0644,root,root)%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 #------------------------------------------------------------------------------
diff --git a/dists/redhat/scummvm-tools.spec.in b/dists/redhat/scummvm-tools.spec.in
index 6a774305d4..026a665198 100644
--- a/dists/redhat/scummvm-tools.spec.in
+++ b/dists/redhat/scummvm-tools.spec.in
@@ -16,6 +16,7 @@ License		: GPL
 Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
+Source1		: libmad-0.15.1b.tar.bz2
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires	: zlib-devel
@@ -30,18 +31,19 @@ Tools for compressing ScummVM datafiles and other related tools.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -n scummvm-tools-%{version}
+%setup -q -a 1 -n tools-%{version}
 
 %build
+(cd libmad-0.15.1b; grep -v 'force-\(mem\|addr\)' configure > configure.new; mv -f configure.new configure; chmod 700 configure; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
+./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp
 make
 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,gob,kyra,queen,saga,scumm_bun,scumm_san,scumm_sou,sword1,sword2,tinsel,touche,tucker} %{buildroot}%{_bindir}
-install -m755 -D de{cine,gob,kyra,scumm,sword2} %{buildroot}%{_bindir}
-install -m755 -D encode_dxa %{buildroot}%{_bindir}/encode_dxa
-install -m755 -D extract_{agos,cine,gob_stk,kyra,loom_tg16,mm_apple,mm_c64,mm_nes,parallaction,scumm_mac,t7g_mac,zak_c64} %{buildroot}%{_bindir}
+install -m755 -D scummvm-tools{,-cli} %{buildroot}%{_bindir}
+install -m755 -D de{cine,gob,kyra,riven,scumm,sword2} %{buildroot}%{_bindir}
+install -m755 -D {construct,extract}_mohawk %{buildroot}%{_bindir}
 install -m644 -D convert_dxa.sh %{buildroot}%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 %clean
@@ -52,10 +54,10 @@ rm -Rf ${RPM_BUILD_ROOT}
 #------------------------------------------------------------------------------
 %files
 %doc README COPYING
-%attr(0755,root,root)%{_bindir}/compress_*
+%attr(0755,root,root)%{_bindir}/scummvm*
 %attr(0755,root,root)%{_bindir}/de*
 %attr(0755,root,root)%{_bindir}/extract_*
-%attr(0755,root,root)%{_bindir}/encode_dxa
+%attr(0755,root,root)%{_bindir}/construct_*
 %attr(0644,root,root)%{_datadir}/scummvm-tools/convert_dxa.sh.sample
 
 #------------------------------------------------------------------------------