[PATCH] Fix RPM build errors on 64bit systems.

Tested on Fedora 17.

Signed-off-by: Wolfgang Denk <[email protected]>
---
Notes:
- I dropped the dependency on metamail, since this package appears to
  be not included in any recent distributions any more.
- I somewhat dout about the config options for "faces" and "glimpse"
  still make sense.  I cannot find such packages for any of therecent
  distros - is anybody still using these?  Where can I foind recent
  source code?

 misc/RPM/exmh.spec |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/misc/RPM/exmh.spec b/misc/RPM/exmh.spec
index 5d2c7e8..ed75b34 100644
--- a/misc/RPM/exmh.spec
+++ b/misc/RPM/exmh.spec
@@ -3,7 +3,7 @@ Name: exmh
 Version: EXMHVERSION 
 Release: 1
 BuildArchitectures: noarch
-Requires: mh, metamail
+Requires: nmh
 License: freeware
 Group: Applications/Mail
 Source0: ftp://ftp.tcl.tk/pub/tcl/exmh/exmh-%{version}.tar.gz
@@ -64,6 +64,8 @@ exmh.
 for i in *.MASTER; do
 	cp $i ${i%%.MASTER}
 done
+pwd
+sed -i -e 's!/usr/lib!%{_libdir}!g' $RPM_SOURCE_DIR/exmh-%{version}-conf.patch
 %patch0 -p1 -b .conf
 
 %build
@@ -84,25 +86,24 @@ for i in *.l; do
 	install -m644 $i $RPM_BUILD_ROOT%{_mandir}/man1/${i%%.l}.1
 done
 
-cp -ar lib/* $RPM_BUILD_ROOT/usr/lib/exmh-%{version}
-cp -ar misc/* $RPM_BUILD_ROOT/usr/lib/exmh-%{version}/misc
+cp -ar lib/* $RPM_BUILD_ROOT%{_libdir}/exmh-%{version}
+cp -ar misc/* $RPM_BUILD_ROOT%{_libdir}/exmh-%{version}/misc
 
 cp %SOURCE2 $RPM_BUILD_ROOT/etc/X11/applnk/Internet/
 install -m644 $RPM_SOURCE_DIR/exmh.wmconfig $RPM_BUILD_ROOT/etc/X11/wmconfig/exmh
 
-find $RPM_BUILD_ROOT/usr/lib/exmh-%{version}    -type f | grep -v $RPM_BUILD_ROOT/usr/lib/exmh-%{version}/misc |sed -e "s|$RPM_BUILD_ROOT||" > filelist
+find $RPM_BUILD_ROOT%{_libdir}/exmh-%{version} -type f | \
+grep -v $RPM_BUILD_ROOT%{_libdir}/exmh-%{version}/misc | \
+sed -e "s|$RPM_BUILD_ROOT||" > filelist
 cat filelist
 %clean
 rm -rf $RPM_BUILD_ROOT
-#
-# Maybe the /usr/lib stuff in the %dir clause and the find statement should
-# be changed to use %{_libdir}? Does %files -f support macros?
-#
+
 %files -f filelist
 %defattr(-,root,root)
-%dir /usr/lib/exmh-%{version}
-%dir /usr/lib/exmh-%{version}/html
-%dir /usr/lib/exmh-%{version}/bitmaps
+%dir %{_libdir}/exmh-%{version}
+%dir %{_libdir}/exmh-%{version}/html
+%dir %{_libdir}/exmh-%{version}/bitmaps
 %doc COPYRIGHT exmh.BUGS exmh.CHANGES exmh.TODO exmh.README lib/html/
 %config /etc/X11/wmconfig/exmh 
 %config /etc/X11/applnk/Internet/exmh.desktop
-- 
1.7.10.2