[Scummvm-git-logs] scummvm master -> 12797b1b5e1973d58b2515a03003809e5dcc0796

Thu Nov 23 22:32:40 CET 2017

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1a2bf89ecc DISTS/FEDORA: Update and simplify scummvm.spec
74958f4c1d DISTS/FEDORA: Update and simplify scummvm-tools.spec
12797b1b5e DISTS/FEDORA: Update README


Commit: 1a2bf89ecc8aa1500d851e68756c9711056f3680
    https://github.com/scummvm/scummvm/commit/1a2bf89ecc8aa1500d851e68756c9711056f3680
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-11-23T22:32:12+01:00

Commit Message:
DISTS/FEDORA: Update and simplify scummvm.spec

This removes libmad from the package as it is in Fedora 24+,
updates faad2 to the most recent release,
removes the hardcoded set of engine-data from the .spec file, and
packages the appdata file.

Changed paths:
    dists/redhat/scummvm.spec
    dists/redhat/scummvm.spec.in

diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 4e9d13f..eb84b6e 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -16,10 +16,8 @@ License		: GPL
 Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
-Source1		: libmad-0.15.1b.tar.bz2
-Source2		: faad2-2.7.tar.bz2
-Source3		: mpeg2dec-0.5.1.tar.bz2
-Patch0		: libmad-0.15.1b-fixes-1.patch
+Source1		: faad2-2.8.6.tar.gz
+Source2		: libmpeg2-0.5.1.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -34,6 +32,8 @@ BuildRequires: fluidsynth-devel
 BuildRequires: libtheora-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-turbo-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: libmad-devel
 
 #------------------------------------------------------------------------------
 #   Description
@@ -52,41 +52,18 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -a 1 -a 2 -a 3 -n scummvm-%{version}
-%patch0 -p0
+%setup -q -a 1 -a 2 -n scummvm-%{version}
 mkdir tmp
 
 %build
-(cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-(cd mpeg2dec-0.5.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
-make
+(cd faad2-2.8.6; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make %{_smp_mflags} -C libfaad all install)
+(cd libmpeg2-0.5.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make -C libmpeg2 all install; make -C include all install)
+./configure --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
+make %{_smp_mflags}
 
 %install
-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 icons/scummvm.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/scummvm.svg
+make DESTDIR=%{buildroot} install
 install -m644 -D dists/redhat/scummvm48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/scummvm.png
-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 gui/themes/translations.dat %{buildroot}%{_datadir}/scummvm/translations.dat
-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
-install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm/teenagent.dat
-install -m644 -D dists/engine-data/titanic.dat %{buildroot}%{_datadir}/scummvm/titanic.dat
-install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat
-install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat
-install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat
-install -m644 -D dists/engine-data/wintermute.zip %{buildroot}%{_datadir}/scummvm/wintermute.zip
-install -m644 -D dists/engine-data/neverhood.dat %{buildroot}%{_datadir}/scummvm/neverhood.dat
-install -m644 -D dists/engine-data/mort.dat %{buildroot}%{_datadir}/scummvm/mort.dat
-install -m644 -D dists/engine-data/access.dat %{buildroot}%{_datadir}/scummvm/access.dat
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -115,29 +92,19 @@ fi
 %{_datadir}/pixmaps/scummvm.xpm
 %{_datadir}/icons/hicolor/48x48/apps/scummvm.png
 %{_datadir}/icons/hicolor/scalable/apps/scummvm.svg
-%{_datadir}/scummvm/scumm*.zip
-%{_datadir}/scummvm/translations.dat
-%{_datadir}/scummvm/pred.dic
-%{_datadir}/scummvm/kyra.dat
-%{_datadir}/scummvm/queen.tbl
-%{_datadir}/scummvm/sky.cpt
-%{_datadir}/scummvm/lure.dat
-%{_datadir}/scummvm/drascula.dat
-%{_datadir}/scummvm/teenagent.dat
-%{_datadir}/scummvm/titanic.dat
-%{_datadir}/scummvm/hugo.dat
-%{_datadir}/scummvm/tony.dat
-%{_datadir}/scummvm/toon.dat
-%{_datadir}/scummvm/wintermute.zip
-%{_datadir}/scummvm/neverhood.dat
-%{_datadir}/scummvm/mort.dat
-%{_datadir}/scummvm/access.dat
+%{_datadir}/appdata/scummvm.appdata.xml
+%{_datadir}/scummvm/*
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Nov 23 2017 (2.0.0)
+  - remove own libmad since this is now in Fedora itself
+* Fri Jul 11 2014 (1.8.0)
+  - add libmad build patch
+  - re-add mpeg2dec
 * Thu Dec 29 2011 (1.4.0-2)
   - include libfaad2
 * Fri Sep 17 2010 (1.2.0)
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index 6c3f7eb..7fbedd7 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -16,10 +16,8 @@ License		: GPL
 Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
-Source1		: libmad-0.15.1b.tar.bz2
-Source2		: faad2-2.7.tar.bz2
-Source3		: mpeg2dec-0.5.1.tar.bz2
-Patch0		: libmad-0.15.1b-fixes-1.patch
+Source1		: faad2-2.8.6.tar.gz
+Source2		: libmpeg2-0.5.1.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -34,6 +32,8 @@ BuildRequires: fluidsynth-devel
 BuildRequires: libtheora-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-turbo-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: libmad-devel
 
 #------------------------------------------------------------------------------
 #   Description
@@ -52,41 +52,18 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -a 1 -a 2 -a 3 -n scummvm-%{version}
-%patch0 -p0
+%setup -q -a 1 -a 2 -n scummvm-%{version}
 mkdir tmp
 
 %build
-(cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-(cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-(cd mpeg2dec-0.5.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
-make
+(cd faad2-2.8.6; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make %{_smp_mflags} -C libfaad all install)
+(cd libmpeg2-0.5.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make -C libmpeg2 all install; make -C include all install)
+./configure --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
+make %{_smp_mflags}
 
 %install
-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 icons/scummvm.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/scummvm.svg
+make DESTDIR=%{buildroot} install
 install -m644 -D dists/redhat/scummvm48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/scummvm.png
-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 gui/themes/translations.dat %{buildroot}%{_datadir}/scummvm/translations.dat
-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
-install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm/teenagent.dat
-install -m644 -D dists/engine-data/titanic.dat %{buildroot}%{_datadir}/scummvm/titanic.dat
-install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat
-install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat
-install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat
-install -m644 -D dists/engine-data/wintermute.zip %{buildroot}%{_datadir}/scummvm/wintermute.zip
-install -m644 -D dists/engine-data/neverhood.dat %{buildroot}%{_datadir}/scummvm/neverhood.dat
-install -m644 -D dists/engine-data/mort.dat %{buildroot}%{_datadir}/scummvm/mort.dat
-install -m644 -D dists/engine-data/access.dat %{buildroot}%{_datadir}/scummvm/access.dat
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -115,29 +92,19 @@ fi
 %{_datadir}/pixmaps/scummvm.xpm
 %{_datadir}/icons/hicolor/48x48/apps/scummvm.png
 %{_datadir}/icons/hicolor/scalable/apps/scummvm.svg
-%{_datadir}/scummvm/scumm*.zip
-%{_datadir}/scummvm/translations.dat
-%{_datadir}/scummvm/pred.dic
-%{_datadir}/scummvm/kyra.dat
-%{_datadir}/scummvm/queen.tbl
-%{_datadir}/scummvm/sky.cpt
-%{_datadir}/scummvm/lure.dat
-%{_datadir}/scummvm/drascula.dat
-%{_datadir}/scummvm/teenagent.dat
-%{_datadir}/scummvm/titanic.dat
-%{_datadir}/scummvm/hugo.dat
-%{_datadir}/scummvm/tony.dat
-%{_datadir}/scummvm/toon.dat
-%{_datadir}/scummvm/wintermute.zip
-%{_datadir}/scummvm/neverhood.dat
-%{_datadir}/scummvm/mort.dat
-%{_datadir}/scummvm/access.dat
+%{_datadir}/appdata/scummvm.appdata.xml
+%{_datadir}/scummvm/*
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Nov 23 2017 (2.0.0)
+  - remove own libmad since this is now in Fedora itself
+* Fri Jul 11 2014 (1.8.0)
+  - add libmad build patch
+  - re-add mpeg2dec
 * Thu Dec 29 2011 (1.4.0-2)
   - include libfaad2
 * Fri Sep 17 2010 (1.2.0)


Commit: 74958f4c1d406a3122ffd942f32e349ae699f7b1
    https://github.com/scummvm/scummvm/commit/74958f4c1d406a3122ffd942f32e349ae699f7b1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-11-23T22:32:12+01:00

Commit Message:
DISTS/FEDORA: Update and simplify scummvm-tools.spec

Changed paths:
    dists/redhat/scummvm-tools.spec
    dists/redhat/scummvm-tools.spec.in


diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 40d191d..8a87b95 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 f648714..373b85f 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


Commit: 12797b1b5e1973d58b2515a03003809e5dcc0796
    https://github.com/scummvm/scummvm/commit/12797b1b5e1973d58b2515a03003809e5dcc0796
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2017-11-23T22:32:12+01:00

Commit Message:
DISTS/FEDORA: Update README

Changed paths:
    dists/redhat/README


diff --git a/dists/redhat/README b/dists/redhat/README
index d1cef06..04a9ab3 100644
--- a/dists/redhat/README
+++ b/dists/redhat/README
@@ -1,34 +1,35 @@
 How to build an RPM:
 
 
-Note: the following assumes that the RPM topdir is /usr/src/redhat .
-If you have set a different topdir in /usr/lib/rpm/macros or ~/.rpmmacros,
-adapt the below instructions where necessary.
+0) Install dependencies:
 
+This assumes Fedora 24 or higher.
+
+dnf install gcc-c++ make git libmad-devel desktop-file-utils libogg-devel libvorbis-devel flac-devel zlib-devel nasm SDL2-devel freetype-devel fluidsynth-devel libtheora-devel libpng-devel libjpeg-turbo-devel alsa-lib-devel wxGTK3-devel boost-devel rpm-build
 
 1) Collect sources:
 
-Place scummvm-%{version}.tar.bz2 and libmad-0.15.1b.tar.bz2 
-in /usr/src/redhat/SOURCES .
-If you have a different version of libmad, put the correct version
-numbers in the .spec file.
+Place scummvm-%{version}.tar.bz2, scummvm-tools-%{version}.tar.bz2,
+faad2-2.8.6.tar.gz, libmpeg2-0.5.1.tar.gz in ~/rpmbuild/SOURCES .
+
+This assumes that the RPM topdir is ~/rpmbuild/ . If you have set a different
+topdir, adapt appropriately.
 
-Place scummvm.spec in /usr/src/redhat/SPECS .
+faad2 is available at https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz/download
+libmpeg2 at http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
 
-2) Build the rpm:
 
-Change directory to /usr/src/redhat/SPECS .
+2) Build the rpms:
+
 Run:
 
 rpmbuild -ba scummvm.spec
+rpmbuild -ba scummvm-tools.spec
 
-The RPM should now be built and placed in /usr/src/redhat/RPMS/i386 and
-the source RPM in /usr/src/redhat/SRPMS
-
+The RPMs should now be built and placed in ~/rpmbuild/RPMS/x86_64 and
+the source RPMs in ~/rpmbuild/SRPMS
 
 
 
-Note: libmad is statically linked into the scummvm binary
-because Fedora does not carry a libmad package, so I did not
-want to make the scummvm package depend on them.
-You can get libmad from http://www.underbit.com/products/mad/ .
+Note: faad2 and libmpeg2 are statically linked into the scummvm binary
+because Fedora do not carry the corresponding packages.



