# HG changeset patch
# User bears
# Date 1013706987 0
# Node ID dbafa3954bbe1990b80954b9d24d0da07b8635b7
# Parent  f8a91e2b4060894f2a4141ae46b86392a3fa4ff8
[svn] * packages/redhat/noffle.spec: Incorporate changes from Carles Arjona.

diff -r f8a91e2b4060 -r dbafa3954bbe packages/redhat/noffle.spec
--- a/packages/redhat/noffle.spec	Thu Feb 14 17:14:34 2002 +0000
+++ b/packages/redhat/noffle.spec	Thu Feb 14 17:16:27 2002 +0000
@@ -4,12 +4,12 @@
 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
+Packager:	Carles Arjona <nospammer@bigfoot.com>
+URL:		http://noffle.sourceforge.net
 BuildRoot:	/var/tmp/%{name}-%{version}-root
-Source: http://download.sourceforge.net/noffle/%{name}-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/noffle/%{name}-%{version}.tar.gz
+Source1:	noffle-expire
 Requires:	gdbm
-Requires:	sendmail
 
 %description
 NOFFLE is a news server optimized for low speed dialup connection to the
@@ -22,30 +22,30 @@
 %build
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s"
 export CFLAGS LDFLAGS
-./configure --prefix=/usr --enable-debug=no
+./configure --prefix=/usr --enable-debug=no --mandir=%{_mandir} \
+ --with-docdir=%{_docdir}
 make
 
 %install
-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 -o 0 -g 0 -d $RPM_BUILD_ROOT%{_bindir}
+install -s -m 4755 -o news -g news src/noffle $RPM_BUILD_ROOT%{_bindir}
+install -o 0 -g 0 -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0644 -o 0 -g 0 docs/noffle.1 $RPM_BUILD_ROOT%{_mandir}/man1/noffle.1
+install -o 0 -g 0 -d $RPM_BUILD_ROOT%{_mandir}/man5
+install -m 0644 -o 0 -g 0 docs/noffle.conf.5 $RPM_BUILD_ROOT%{_mandir}/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
 install -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle/lock
 install -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle/requested
 install -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle/outgoing
 install -o news -g news -d $RPM_BUILD_ROOT/var/spool/noffle/overview
+install -o 0 -g 0 -d $RPM_BUILD_ROOT/etc/cron.daily
+install -m 0755 -o news -g news $RPM_SOURCE_DIR/noffle-expire $RPM_BUILD_ROOT/etc/cron.daily/noffle-expire
 install -m 0600 -o news -g news noffle.conf.example $RPM_BUILD_ROOT/etc/noffle.conf
-install -o 0 -g 0 -d $RPM_BUILD_ROOT/etc/cron.daily
-install -m 0755 -o news -g news packages/redhat/noffle-expire $RPM_BUILD_ROOT/etc/cron.daily/noffle-expire
 
 %post
 # Create inews line
-ln -sf /usr/bin/noffle /usr/bin/inews
+ln -sf %{_bindir}/noffle %{_bindir}/inews
 # Update /etc/inetd.conf
 if ! grep -q '^[# \t]*nntp' /etc/inetd.conf ; then
 	echo >> /etc/inetd.conf
@@ -54,6 +54,23 @@
                 kill -HUP `cat /var/run/inetd.pid`
         fi
 fi
+# xinetd configuration file
+if [ -d /etc/xinetd.d ]; then
+    cat << END > /etc/xinetd.d/nntp
+# default: on
+# description: The noffle news server serves NNTP connections.
+service nntp
+{
+        disable = no
+        socket_type             = stream
+        protocol                = tcp
+        wait                    = no
+        user                    = news
+        server                  = %{_bindir}/noffle
+        server_args             = -r
+}
+END
+fi
 if ! grep -q '^[# \t]*noffle' /etc/hosts.deny ; then
 	echo >> /etc/hosts.deny
 	echo "noffle: ALL EXCEPT LOCAL" >> /etc/hosts.deny
@@ -76,6 +93,9 @@
         		fi
 		fi
 	fi
+	if [ -f /etc/xinetd.d/nntp ]; then
+	   rm -f /etc/xinetd.d/nntp
+	fi
 	if [ -f /etc/hosts.deny ] &&
 	   grep noffle /etc/hosts.deny > /dev/null 2>&1 ; then
 		if grep -v noffle /etc/hosts.deny > /tmp/hosts.deny.$$ ; then
@@ -88,20 +108,22 @@
 [ "$RPM_BUILD_ROOT" != "" ] && rm -rf $RPM_BUILD_ROOT
 
 %files
-%config /etc/noffle.conf
+%config(noreplace) /etc/noffle.conf
 %doc README INSTALL ChangeLog docs/FAQ docs/NOTES docs/INTERNALS
 %doc docs/noffle.lsm COPYING noffle.conf.example
-/usr/bin/noffle
-/usr/man/*
+%{_bindir}/noffle
+%{_mandir}/man?/*
 /etc/cron.daily/noffle-expire
 %dir /var/spool/noffle
-%dir /var/spool/noffle/data
-%dir /var/spool/noffle/lock
-%dir /var/spool/noffle/requested
-%dir /var/spool/noffle/outgoing
-%dir /var/spool/noffle/overview
+%dir /var/spool/noffle/*
 
 %changelog
+* Sun Jan 13 2002 Jim Hague <jim.hague@acm.org>
+- Incorporate changes from Carles Arjona <nospammer@bigfoot.com>
+- Version 1.1.1-2 RPM
+- Added support for xinetd
+- Separated noffle.expire from the original tarball sources
+
 * 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