aboutsummaryrefslogtreecommitdiff
path: root/dists/redhat
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2017-11-23 22:14:08 +0100
committerWillem Jan Palenstijn2017-11-23 22:32:12 +0100
commit74958f4c1d406a3122ffd942f32e349ae699f7b1 (patch)
tree22df7073a6b51ab469ae2b8aa4097da466c135c6 /dists/redhat
parent1a2bf89ecc8aa1500d851e68756c9711056f3680 (diff)
downloadscummvm-rg350-74958f4c1d406a3122ffd942f32e349ae699f7b1.tar.gz
scummvm-rg350-74958f4c1d406a3122ffd942f32e349ae699f7b1.tar.bz2
scummvm-rg350-74958f4c1d406a3122ffd942f32e349ae699f7b1.zip
DISTS/FEDORA: Update and simplify scummvm-tools.spec
Diffstat (limited to 'dists/redhat')
-rw-r--r--dists/redhat/scummvm-tools.spec38
-rw-r--r--dists/redhat/scummvm-tools.spec.in42
2 files changed, 46 insertions, 34 deletions
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 40d191da78..8a87b95ffb 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -16,11 +16,18 @@ 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
-BuildRequires : wxGTK-devel
+BuildRequires: zlib-devel
+BuildRequires: wxGTK3-devel
+BuildRequires: libmad-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libogg-devel
+BuildRequires: libpng-devel
+BuildRequires: boost-devel
+BuildRequires: flac-devel
+BuildRequires: freetype-devel
+
#------------------------------------------------------------------------------
# Description
#------------------------------------------------------------------------------
@@ -31,19 +38,20 @@ Tools for compressing ScummVM datafiles and other related tools.
# install scripts
#------------------------------------------------------------------------------
%prep
-%setup -q -a 1 -n scummvm-tools-%{version}
+%setup -q -n scummvm-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
+./configure --prefix=%{_prefix}
+make %{_smp_mflags}
%install
-install -m755 -d %{buildroot}%{_bindir}
-install -m755 -D create_sjisfnt %{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}
+make DESTDIR=%{buildroot} install
+rm %{buildroot}%{_datadir}/scummvm-tools/detaillogo.jpg
+rm %{buildroot}%{_datadir}/scummvm-tools/logo.jpg
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools.icns
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools.ico
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools_128.png
+rm %{buildroot}%{_datadir}/scummvm-tools/tile.gif
%clean
rm -Rf ${RPM_BUILD_ROOT}
@@ -53,11 +61,7 @@ rm -Rf ${RPM_BUILD_ROOT}
#------------------------------------------------------------------------------
%files
%doc README COPYING
-%attr(0755,root,root)%{_bindir}/scummvm*
-%attr(0755,root,root)%{_bindir}/create_sjisfnt
-%attr(0755,root,root)%{_bindir}/de*
-%attr(0755,root,root)%{_bindir}/extract_*
-%attr(0755,root,root)%{_bindir}/construct_*
+%attr(0755,root,root)%{_bindir}/*
#------------------------------------------------------------------------------
# Change Log
diff --git a/dists/redhat/scummvm-tools.spec.in b/dists/redhat/scummvm-tools.spec.in
index f64871486d..373b85f693 100644
--- a/dists/redhat/scummvm-tools.spec.in
+++ b/dists/redhat/scummvm-tools.spec.in
@@ -16,11 +16,18 @@ 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
-BuildRequires : wxGTK-devel
+BuildRequires: zlib-devel
+BuildRequires: wxGTK3-devel
+BuildRequires: libmad-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libogg-devel
+BuildRequires: libpng-devel
+BuildRequires: boost-devel
+BuildRequires: flac-devel
+BuildRequires: freetype-devel
+
#------------------------------------------------------------------------------
# Description
#------------------------------------------------------------------------------
@@ -31,19 +38,20 @@ Tools for compressing ScummVM datafiles and other related tools.
# install scripts
#------------------------------------------------------------------------------
%prep
-%setup -q -a 1 -n scummvm-tools-%{version}
+%setup -q -n scummvm-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
+./configure --prefix=%{_prefix}
+make %{_smp_mflags}
%install
-install -m755 -d %{buildroot}%{_bindir}
-install -m755 -D create_sjisfnt %{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}
+make DESTDIR=%{buildroot} install
+rm %{buildroot}%{_datadir}/scummvm-tools/detaillogo.jpg
+rm %{buildroot}%{_datadir}/scummvm-tools/logo.jpg
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools.icns
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools.ico
+rm %{buildroot}%{_datadir}/scummvm-tools/scummvmtools_128.png
+rm %{buildroot}%{_datadir}/scummvm-tools/tile.gif
%clean
rm -Rf ${RPM_BUILD_ROOT}
@@ -53,15 +61,15 @@ rm -Rf ${RPM_BUILD_ROOT}
#------------------------------------------------------------------------------
%files
%doc README COPYING
-%attr(0755,root,root)%{_bindir}/scummvm*
-%attr(0755,root,root)%{_bindir}/create_sjisfnt
-%attr(0755,root,root)%{_bindir}/de*
-%attr(0755,root,root)%{_bindir}/extract_*
-%attr(0755,root,root)%{_bindir}/construct_*
+%attr(0755,root,root)%{_bindir}/*
#------------------------------------------------------------------------------
# Change Log
#------------------------------------------------------------------------------
%changelog
+* Thu Nov 23 2017 (2.0.0)
+ - remove own libmad since this is now in Fedora itself
+* Sat Apr 03 2010 (1.2.0)
+ - include libmad
* Sat Mar 26 2005 (0.7.1)
- first tools package