rpms/inn/devel inn.spec,1.36,1.37 innd.init,1.6,1.7

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/inn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27836

Modified Files:
	inn.spec innd.init 
Log Message:
initscript changes - fix of stop() phase errors, added URL , fixed License tag


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- inn.spec	2 Oct 2007 10:48:02 -0000	1.36
+++ inn.spec	7 Jan 2008 16:22:07 -0000	1.37
@@ -1,9 +1,11 @@
 Summary: The InterNetNews (INN) system, an Usenet news server
 Name: inn
 Version: 2.4.3
-Release: 7%{?dist}
-License: GPL
+Release: 8%{?dist}
+#see LICENSE file for details
+License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
+URL: http://www.isc.org/products/INN/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
 Source2: inn-default-distributions
 Source4: inn-cron-expire
@@ -247,7 +249,7 @@
 exit 0
 
 %files -f files.main
-%defattr(-,news,news)
+%defattr(-,news,news,-)
 %dir /usr/lib/news/bin/control
 %dir /usr/lib/news/bin/filter
 %dir /usr/lib/news/bin/rnews.libexec
@@ -291,6 +293,11 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon Jan 07 2008 Ondrej Vasik <ovasik at redhat.com> 2.4.3-8
+- initscript changes - review changes caused errors while
+  in stop() phase - not known variable NEWSBIN(#401241)
+- added url, fixed License tag
+
 * Tue Oct 02 2007 Ondrej Dvoracek <odvorace at redhat.com> 2.4.3-7
 - initscript review (#246951)
 - added buildrequires for perl-devel and python


Index: innd.init
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/innd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- innd.init	1 Oct 2007 11:11:28 -0000	1.6
+++ innd.init	7 Jan 2008 16:22:07 -0000	1.7
@@ -28,12 +28,13 @@
 
 RETVAL=0
 
+[ -d /etc/news ] || exit 1
+[ -f /etc/news/inn.conf ] || exit 6
+. /usr/lib/news/lib/innshellvars || exit 1
+ 
 start() {
   # Check that networking is up.
   [ "${NETWORKING}" = "no" ] && exit 1
-  [ -d /etc/news ] || exit 1
-  [ -f /etc/news/inn.conf ] || exit 6
-  . /usr/lib/news/lib/innshellvars || exit 1
   [ -d "$SPOOLBASE" ] || exit 1
   [ -f "$HISTORY" -a -f "$HISTORY.hash" ] || {
     echo $"Please run makehistory and/or makedbz before starting innd." >&2