update from wjp

svn-id: r14246

2 files changed, 38 insertions, 4 deletions

diff --git a/dists/redhat/README b/dists/redhat/README
new file mode 100644
index 0000000000..a8f5bdb2af
--- /dev/null
+++ b/dists/redhat/README
@@ -0,0 +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,
+replace it with the correct topdir where necessary.
+
+
+1) Collect sources:
+
+Place scummvm-%{version}.tar.bz2, libmad-0.15.1b.tar.bz2 and 
+mpeg2dec-0.4.0b.tar.bz2 in /usr/src/redhat/SOURCES .
+If you have different versions of mpeg2dec or libmad, put the correct version
+numbers in the .spec file.
+
+Place scummvm.spec in /usr/src/redhat/SPECS .
+
+2) Build the rpm:
+
+Change directory to /usr/src/redhat/SPECS .
+Run:
+
+rpmbuild -ba scummvm.spec
+
+The RPM should now be built and placed in /usr/src/redhat/RPMS/i386 and
+the source RPM in /usr/src/redhat/SRPMS
+
+
+
+
+Note: libmad and mpeg2dec are statically linked into the scummvm binary
+because Fedora does not carry libmad and mpeg2dec packages, so I did not
+want to make the scummvm package depend on them.
+You can get libmad from http://www.underbit.com/products/mad/
+and mpeg2dec from http://libmpeg2.sourceforge.net/ .
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 875e49c857..acaa7c3232 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -8,8 +8,8 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 0.6.0
-Release		: 2
+Version		: 0.6.1
+Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
 License		: GPL
@@ -19,7 +19,6 @@ Url             : http://www.scummvm.org
 Source		: %{name}-%{version}.tar.bz2
 Source1		: libmad-0.15.1b.tar.bz2
 Source2		: mpeg2dec-0.4.0b.tar.bz2
-Source3		: scummvm.desktop
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -53,7 +52,7 @@ make
 install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm
 install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6
 install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm
-desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications %{SOURCE3}
+desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop
 
 %clean
 rm -Rf ${RPM_BUILD_ROOT}