rpms/inn/devel inn.spec,1.65,1.66 innd.init,1.7,1.8

[Nikola Pajkovsky]

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24765

Modified Files:
	inn.spec innd.init 
Log Message:
fix ugly inn.spec and init script


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- inn.spec	24 Jun 2009 08:37:25 -0000	1.65
+++ inn.spec	13 Jul 2009 13:53:29 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.0
-Release: 2
+Release: 3%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -28,7 +28,8 @@ BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
 Requires: chkconfig, grep, coreutils, sed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: bash >= 2.0, inews
+Requires: bash >= 2.0
+Requires(post): inews
 
 # XXX white out bogus perl requirement for now
 Provides: perl(::usr/lib/innshellvars.pl) = %{version}-%{release}
@@ -193,30 +194,8 @@ mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/ld.
 
 echo '%{_libdir}/news/lib' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/inn-%{_arch}.conf
 
-
-#Build filelist
 rm -rf $RPM_BUILD_ROOT/usr/lib/news/include
-echo "%defattr(-,news,news)" > files.list
-find $RPM_BUILD_ROOT -type f -or -type l | \
-  sed -e "s|$RPM_BUILD_ROOT||g" | \
-  sed 's|^/etc/cron|%config(noreplace) %attr(-,root,root) &|' | \
-  sed 's|^/etc/rc.d|%config(noreplace) %attr(-,root,root) &|' | \
-  sed 's|^/etc|%config(noreplace) &|' | \
-  sed 's|^/etc/news|%config(noreplace) %attr(0640,news,news) &|' | \
-  sed 's|^/var/lib/news/|%config(noreplace) &|' | \
-  sed 's|.*innshellvar|%config(noreplace) &|' | \
-  sed 's|/var/log/news|%ghost &|' | \
-  sed 's|/usr/lib/news/bin/inndstart$|%attr(4550,root,news) /usr/lib/news/bin/inndstart|' | \
-  sed 's|/usr/lib/news/bin/startinnfeed$|%attr(4550,root,news) /usr/lib/news/bin/startinnfeed|' | \
-  sed 's|/usr/lib/news/bin/rnews$|%attr(4550,uucp,news) /usr/lib/news/bin/rnews|' > files.list
-#  echo "/usr/lib/news/bin/filter/*.pyc" >> files.list
-#  echo "/usr/lib/news/bin/filter/*.pyo" >> files.list
-  (echo "%defattr(-,news,news)" ; grep -v inews files.list | \
-  egrep -v "\.(h|so|a|la)$" | \
-  grep -v "news/inn.conf" | \
-  grep -v "/man/") > files.main
-  echo "%defattr(-,root,root)" > files.devel
-  egrep "\.(h|so)$" files.list >> files.devel
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -225,6 +204,7 @@ rm -f files.list files.main files.devel 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add innd
+#su -m news -c '/usr/lib/news/bin/makehistory'
 su -m news -c '/usr/lib/news/bin/makedbz -i -o'
 
 umask 002
@@ -302,22 +282,220 @@ if [ "$1" -ge 1 ]; then
 fi
 exit 0
 
-%files -f files.main
+%files
 %defattr(-,news,news,-)
+/usr/bin/rnews
+
+# /etc config files plus cron config
+%config(noreplace) /etc/rc.news
+%config(noreplace) /etc/ld.so.conf.d/inn-%{_arch}.conf
+%config(noreplace) %attr(-,root,root) /etc/rc.d/init.d/innd
+%config(noreplace) %attr(-,root,root) /etc/cron.hourly/inn-cron-rnews
+%config(noreplace) %attr(-,root,root) /etc/cron.hourly/inn-cron-nntpsend
+%config(noreplace) %attr(-,root,root) /etc/cron.daily/inn-cron-expire
+
+# /etc/news config files
+%dir %{_sysconfdir}/news
+%config(noreplace) %{_sysconfdir}/news/passwd.nntp
+%config(noreplace) %{_sysconfdir}/news/send-uucp.cf
+%config(noreplace) %{_sysconfdir}/news/actsync.cfg
+%config(noreplace) %{_sysconfdir}/news/motd.news
+%config(noreplace) %{_sysconfdir}/news/expire.ctl
+%config(noreplace) %{_sysconfdir}/news/actsync.ign
+%config(noreplace) %{_sysconfdir}/news/innreport.conf
+%config(noreplace) %{_sysconfdir}/news/distrib.pats
+%config(noreplace) %{_sysconfdir}/news/buffindexed.conf
+%config(noreplace) %{_sysconfdir}/news/innwatch.ctl
+%config(noreplace) %{_sysconfdir}/news/nntpsend.ctl
+%config(noreplace) %{_sysconfdir}/news/innfeed.conf
+%config(noreplace) %{_sysconfdir}/news/nnrpd.track
+%config(noreplace) %{_sysconfdir}/news/control.ctl.local
+%config(noreplace) %{_sysconfdir}/news/storage.conf
+%config(noreplace) %{_sysconfdir}/news/moderators
+%config(noreplace) %{_sysconfdir}/news/news2mail.cf
+%config(noreplace) %{_sysconfdir}/news/cycbuff.conf
+%config(noreplace) %{_sysconfdir}/news/subscriptions
+%config(noreplace) %{_sysconfdir}/news/control.ctl
+%config(noreplace) %{_sysconfdir}/news/localgroups
+%config(noreplace) %{_sysconfdir}/news/.profile
+%config(noreplace) %{_sysconfdir}/news/nocem.ctl
+%config(noreplace) %{_sysconfdir}/news/incoming.conf
+%config(noreplace) %{_sysconfdir}/news/radius.conf
+%config(noreplace) %{_sysconfdir}/news/ovdb.conf
+%config(noreplace) %{_sysconfdir}/news/newsfeeds
+%config(noreplace) %{_sysconfdir}/news/readers.conf
+
+%dir /var/lib/news
+%config(noreplace) /var/lib/news/active.times
+%config(noreplace) /var/lib/news/distributions
+%config(noreplace) /var/lib/news/newsgroups
+%config(noreplace) /var/lib/news/active
+%config(noreplace) /var/lib/news/subscriptions
+%config(noreplace) /var/lib/news/history
+
 %dir /usr/lib/news
 %dir /usr/lib/news/bin
-%dir /usr/lib/news/doc
-%dir /usr/lib/news/lib
-%dir /usr/lib/news/bin/rnews.libexec
+/usr/lib/news/bin/controlbatch
+%attr(4510,root,news) /usr/lib/news/bin/innbind
+/usr/lib/news/bin/docheckgroups
+/usr/lib/news/bin/imapfeed
+/usr/lib/news/bin/send-nntp
+/usr/lib/news/bin/actmerge
+/usr/lib/news/bin/ovdb_server
+/usr/lib/news/bin/filechan
+/usr/lib/news/bin/ninpaths
+/usr/lib/news/bin/mod-active
+/usr/lib/news/bin/news2mail
+/usr/lib/news/bin/innconfval
+/usr/lib/news/bin/shlock
+/usr/lib/news/bin/nnrpd
+/usr/lib/news/bin/controlchan
+/usr/lib/news/bin/procbatch
+/usr/lib/news/bin/expire
+/usr/lib/news/bin/convdate
+/usr/lib/news/bin/pullnews
+/usr/lib/news/bin/archive
+/usr/lib/news/bin/cnfsstat
+/usr/lib/news/bin/grephistory
+/usr/lib/news/bin/send-ihave
+/usr/lib/news/bin/tinyleaf
+/usr/lib/news/bin/cvtbatch
+/usr/lib/news/bin/expirerm
+%attr(4550,uucp,news) /usr/lib/news/bin/rnews
+/usr/lib/news/bin/innxmit
+/usr/lib/news/bin/actsyncd
+/usr/lib/news/bin/shrinkfile
+/usr/lib/news/bin/makedbz
+/usr/lib/news/bin/actsync
+/usr/lib/news/bin/pgpverify
+/usr/lib/news/bin/inndf
+/usr/lib/news/bin/scanlogs
+/usr/lib/news/bin/simpleftp
+/usr/lib/news/bin/ovdb_init
+/usr/lib/news/bin/ctlinnd
+/usr/lib/news/bin/innstat
+/usr/lib/news/bin/send-uucp
+/usr/lib/news/bin/buffchan
+/usr/lib/news/bin/perl-nocem
+/usr/lib/news/bin/scanspool
+/usr/lib/news/bin/expireover
+/usr/lib/news/bin/batcher
+/usr/lib/news/bin/fastrm
+/usr/lib/news/bin/innmail
+/usr/lib/news/bin/innxbatch
+/usr/lib/news/bin/buffindexed_d
+/usr/lib/news/bin/nntpget
+/usr/lib/news/bin/cnfsheadconf
+/usr/lib/news/bin/ovdb_stat
+/usr/lib/news/bin/prunehistory
+/usr/lib/news/bin/innreport
+/usr/lib/news/bin/getlist
+/usr/lib/news/bin/innd
+/usr/lib/news/bin/innupgrade
+/usr/lib/news/bin/news.daily
+/usr/lib/news/bin/sm
+/usr/lib/news/bin/innwatch
+/usr/lib/news/bin/inncheck
+/usr/lib/news/bin/writelog
+/usr/lib/news/bin/signcontrol
+/usr/lib/news/bin/tdx-util
+/usr/lib/news/bin/tally.control
+/usr/lib/news/bin/overchan
+/usr/lib/news/bin/sendinpaths
+/usr/lib/news/bin/makehistory
+/usr/lib/news/bin/nntpsend
+/usr/lib/news/bin/mailpost
+/usr/lib/news/bin/innfeed
+/usr/lib/news/bin/ovdb_monitor
+/usr/lib/news/bin/sendxbatches
+
+%dir /usr/lib/news/bin/filter
+/usr/lib/news/bin/filter/filter_nnrpd.pl
+/usr/lib/news/bin/filter/nnrpd_access.pl
+/usr/lib/news/bin/filter/startup_innd.pl
+/usr/lib/news/bin/filter/nnrpd_auth.py
+/usr/lib/news/bin/filter/nnrpd_access.py
+/usr/lib/news/bin/filter/nnrpd_auth.pl
+/usr/lib/news/bin/filter/INN.py
+/usr/lib/news/bin/filter/nnrpd.py
+/usr/lib/news/bin/filter/filter_innd.py
+/usr/lib/news/bin/filter/nnrpd_dynamic.py
+
 %dir /usr/lib/news/bin/auth
 %dir /usr/lib/news/bin/auth/passwd
+/usr/lib/news/bin/auth/passwd/radius
+/usr/lib/news/bin/auth/passwd/ckpasswd
+
 %dir /usr/lib/news/bin/auth/resolv
-%dir /usr/lib/news/bin/filter
+/usr/lib/news/bin/auth/resolv/domain
+/usr/lib/news/bin/auth/resolv/ident
+
 %dir /usr/lib/news/bin/control
+/usr/lib/news/bin/control/version.pl
+/usr/lib/news/bin/control/ihave.pl
+/usr/lib/news/bin/control/sendsys.pl
+/usr/lib/news/bin/control/sendme.pl
+/usr/lib/news/bin/control/checkgroups.pl
+/usr/lib/news/bin/control/senduuname.pl
+/usr/lib/news/bin/control/newgroup.pl
+/usr/lib/news/bin/control/rmgroup.pl
+
+%dir /usr/lib/news/bin/rnews.libexec
+/usr/lib/news/bin/rnews.libexec/encode
+/usr/lib/news/bin/rnews.libexec/gunbatch
+/usr/lib/news/bin/rnews.libexec/decode
+/usr/lib/news/bin/rnews.libexec/bunbatch
+/usr/lib/news/bin/rnews.libexec/c7unbatch
+
+%dir /usr/lib/news/lib
+/usr/lib/news/lib/innreport_inn.pm
+/usr/lib/news/lib/libinnhist.so.2
+/usr/lib/news/lib/libstorage.so.2.0.0
+/usr/lib/news/lib/libstorage.so.2
+%config(noreplace) /usr/lib/news/lib/innshellvars.pl
+%config(noreplace) /usr/lib/news/lib/innshellvars
+%config(noreplace) /usr/lib/news/lib/innshellvars.tcl
+/usr/lib/news/lib/libinn.so.2
+/usr/lib/news/lib/libinn.so.2.0.0
+/usr/lib/news/lib/libinnhist.so.2.0.0
+
+%dir /usr/lib/news/doc
+/usr/lib/news/doc/LICENSE
+/usr/lib/news/doc/config-design
+/usr/lib/news/doc/history-innfeed
+/usr/lib/news/doc/GPL
+/usr/lib/news/doc/sample-control
+/usr/lib/news/doc/config-semantics
+/usr/lib/news/doc/CONTRIBUTORS
+/usr/lib/news/doc/external-auth
+/usr/lib/news/doc/TODO
+/usr/lib/news/doc/README
+/usr/lib/news/doc/NEWS
+/usr/lib/news/doc/HACKING
+/usr/lib/news/doc/hook-python
+/usr/lib/news/doc/config-syntax
+/usr/lib/news/doc/hook-perl
+/usr/lib/news/doc/INSTALL
+/usr/lib/news/doc/history
+
+%dir /usr/lib/news/http
+/usr/lib/news/http/innreport.css
+
+%dir /usr/lib/news/lib/perl
+%dir /usr/lib/news/lib/perl/INN
+/usr/lib/news/lib/perl/INN/Config.pm
+
+# %dir /var/log/news
+# %config(noreplace) /var/lib/news/active.times
+# %config(noreplace) /var/lib/news/distributions
+# %config(noreplace) /var/lib/news/newsgroups
+# %config(noreplace) /var/lib/news/active
+# %config(noreplace) /var/lib/news/subscriptions
+# %config(noreplace) /var/lib/news/history
+
 %if "%{_libdir}" != "/usr/lib"
 %dir %{_libdir}/news
 %endif
-%dir /etc/news/
 %dir /var/spool/news
 %dir /var/spool/news/archive
 %dir /var/spool/news/articles
@@ -326,9 +504,7 @@ exit 0
 %dir /var/spool/news/innfeed
 %dir /var/spool/news/outgoing
 %dir /var/spool/news/overview
-%dir /var/log/news
 %dir /var/log/news/OLD
-%dir /var/lib/news
 %dir /var/lib/news/tmp
 %dir /var/run/news
 %defattr(-,root,root)
@@ -344,19 +520,33 @@ exit 0
 %doc NEWS README* ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html
 %doc %dir samples
 
-%files devel -f files.devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/inn
+/usr/include/inn/clibrary.h
+/usr/include/inn/config.h
+/usr/include/inn/dbz.h
+/usr/include/inn/defines.h
+/usr/include/inn/libinn.h
+/usr/include/inn/storage.h
+/usr/include/inn/system.h
+/usr/lib/news/lib/libstorage.so
+/usr/lib/news/lib/libinn.so
+/usr/lib/news/lib/libinnhist.so
 %{_mandir}/man3/*
 
 %files -n inews
 %defattr(-,root,root)
-%config(noreplace) /etc/news/inn.conf
+%config(noreplace) %attr(-,news,news) /etc/news/inn.conf
 /usr/bin/inews
 %attr(0755,root,root) /usr/lib/news/bin/inews
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon Jul 13 2009 Nikola Pajkovsky <npajkovs at redhat.com> 2.5.0-3
+- ugly sed script for file section was deleted and rewrite in classic style
+- fix init script(does not start correctly and shutdown when pid does not exist when service run)
+
 * Wed Jun 24 2009 Ondrej Vasik <ovasik at redhat.com> - 2.5.0-2
 - add support for load average to makehistory(#276061)
 - update faq, ship it in %doc


Index: innd.init
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/innd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- innd.init	7 Jan 2008 16:22:07 -0000	1.7
+++ innd.init	13 Jul 2009 13:53:29 -0000	1.8
@@ -35,12 +35,11 @@ RETVAL=0
 start() {
   # Check that networking is up.
   [ "${NETWORKING}" = "no" ] && exit 1
-  [ -d "$SPOOLBASE" ] || exit 1
+  [ -d "$SPOOLDIR" ] || exit 1
   [ -f "$HISTORY" -a -f "$HISTORY.hash" ] || {
     echo $"Please run makehistory and/or makedbz before starting innd." >&2
     exit 1
   }
-		
   echo -n $"Starting INND system: "
   # INN uses too many un-checked shell scripts
   unset LANG
@@ -63,6 +62,11 @@ stop() {
       echo -n $"Stopping INND service (the hard way): "
       killproc innd
     fi
+  else
+    if ps -U news | grep innd > /dev/null; then
+        echo $"Stopping INND service (PID not found, the hard way): "
+        killproc innd
+    fi
     RETVAL=$?
     [ $RETVAL -eq 0 ] && rm -f /var/run/news/innd.pid
     echo
@@ -99,7 +103,7 @@ reload() {
 
 restart() {
   stop
-  start                                                                   
+  start
 }
 
 # See how we were called.