--- a/packages/redhat/noffle.spec	Wed Oct 31 11:44:53 2001 +0000
+++ b/packages/redhat/noffle.spec	Tue Nov 06 21:22:19 2001 +0000
@@ -1,17 +1,15 @@
 Summary: 	Usenet newsserver for small sites
 Name: 		noffle
-Version: 	1.0pre6
-Release: 	4
+Version: 	1.1
+Release: 	1
 Group: 		Networking/Daemons
 Copyright:	GPL
 Packager:	Soenke J. Peters <peters+rpm@simprovement.com>
 URL:		http://home.t-online.de/home/markus.enzenberger/noffle.html
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 Source: http://download.sourceforge.net/noffle/%{name}-%{version}.tar.gz
-Prefix:		/usr
-
 Requires:	gdbm
-Requires:	mailx
+Requires:	sendmail
 
 %description
 NOFFLE is a news server optimized for low speed dialup connection to the
@@ -28,12 +26,12 @@
 make
 
 %install
-install -o 0 -g 0 -d $RPM_BUILD_ROOT/%{prefix}/bin
-install -s -m 4755 -o news -g news src/noffle $RPM_BUILD_ROOT/%{prefix}/bin
-install -o 0 -g 0 -d $RPM_BUILD_ROOT/%{prefix}/man/man1
-install -m 0644 -o 0 -g 0 docs/noffle.1 $RPM_BUILD_ROOT/%{prefix}/man/man1/noffle.1
-install -o 0 -g 0 -d $RPM_BUILD_ROOT/%{prefix}/man/man5
-install -m 0644 -o 0 -g 0 docs/noffle.conf.5 $RPM_BUILD_ROOT/%{prefix}/man/man5/noffle.conf.5
+install -o 0 -g 0 -d $RPM_BUILD_ROOT/usr/bin
+install -s -m 4755 -o news -g news src/noffle $RPM_BUILD_ROOT/usr/bin
+install -o 0 -g 0 -d $RPM_BUILD_ROOT/usr/man/man1
+install -m 0644 -o 0 -g 0 docs/noffle.1 $RPM_BUILD_ROOT/usr/man/man1/noffle.1
+install -o 0 -g 0 -d $RPM_BUILD_ROOT/usr/man/man5
+install -m 0644 -o 0 -g 0 docs/noffle.conf.5 $RPM_BUILD_ROOT/usr/man/man5/noffle.conf.5
 install -m 2755 -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle
 install -o 0 -g 0 -d $RPM_BUILD_ROOT/etc
 install -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle/data
@@ -47,11 +45,11 @@
 
 %post
 # Create inews line
-ln -sf $RPM_BUILD_ROOT/%{prefix}/bin/noffle $RPM_BUILD_ROOT/%{prefix}/bin/inews
+ln -sf /usr/bin/noffle /usr/bin/inews
 # Update /etc/inetd.conf
 if ! grep -q '^[# \t]*nntp' /etc/inetd.conf ; then
 	echo >> /etc/inetd.conf
-	echo "nntp stream tcp nowait news /usr/sbin/tcpd %{prefix}/bin/noffle -r" >> /etc/inetd.conf
+	echo "nntp stream tcp nowait news /usr/sbin/tcpd usr/bin/noffle -r" >> /etc/inetd.conf
         if [ -f /var/run/inetd.pid ] ; then
                 kill -HUP `cat /var/run/inetd.pid`
         fi
@@ -67,7 +65,7 @@
 %postun
 # The script gets 0 on uninstall, 1 on upgrade. Don't remove
 # hosts.deny/inetd.conf lines on upgrade.
-rm $RPM_BUILD_ROOT/%{prefix}/bin/inews
+rm /usr/bin/inews
 if [ "$1" = 0 ] ; then
 	if [ -f /etc/inetd.conf ] &&
 	   grep noffle /etc/inetd.conf > /dev/null 2>&1 ; then
@@ -91,11 +89,10 @@
 
 %files
 %config /etc/noffle.conf
-%doc README INSTALL ChangeLog docs/FAQ docs/NOTES docs/INTERNALS docs/noffle.lsm COPYING noffle.conf.example
-%{prefix}/bin/noffle
-%{prefix}/man/man1/noffle.1
-%{prefix}/man/man5/noffle.conf.5
-%{prefix}/bin/inews
+%doc README INSTALL ChangeLog docs/FAQ docs/NOTES docs/INTERNALS
+%doc docs/noffle.lsm COPYING noffle.conf.example
+/usr/bin/noffle
+/usr/man/*
 /etc/cron.daily/noffle-expire
 %dir /var/spool/noffle
 %dir /var/spool/noffle/data
@@ -105,6 +102,12 @@
 %dir /var/spool/noffle/overview
 
 %changelog
+* Wed Oct 31 2001 Jim Hague <jim.hague@acm.org>
+- Up version to 1.1-1, and remove inews from %files as it is created by %post.
+  Remove relocation prefix - it wasn't working properly. Also
+  RPM 4 seems to automatically compress man pages, so put man pages in
+  %files as /usr/man/* so we pick up whatever is there, compressed or not.
+
 * Thu Oct 26 2000 Jim Hague <jim.hague@am.org>
 - Added inews link.