rpms/inn/F-13 inn-2.5.1-config-path.patch, NONE, 1.1 inn-cron-expire, 1.5, 1.6 inn-cron-nntpsend, 1.5, 1.6 inn-cron-rnews, 1.5, 1.6 inn.spec, 1.75, 1.76 innd.init, 1.8, 1.9

Nikola Pajkovsky npajkovs at fedoraproject.org
Fri Jul 2 12:04:10 UTC 2010 

Author: npajkovs

Update of /cvs/extras/rpms/inn/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv488

Modified Files:
	inn-cron-expire inn-cron-nntpsend inn-cron-rnews inn.spec 
	innd.init 
Added Files:
	inn-2.5.1-config-path.patch 
Log Message:
Resolves: #597799 #596580 #604473

inn-2.5.1-config-path.patch:
 Config.pm.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE inn-2.5.1-config-path.patch ---
diff -up inn-2.5.1/perl/INN/Config.pm.in.config-path inn-2.5.1/perl/INN/Config.pm.in
--- inn-2.5.1/perl/INN/Config.pm.in.config-path	2010-06-02 13:58:05.985806773 +0200
+++ inn-2.5.1/perl/INN/Config.pm.in	2010-06-02 13:58:19.616811684 +0200
@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
 
 ##  Then, process the variables provided by innconfval.
 my @INNCONFVAR = ();
-my @values = `${exec_prefix}/bin/innconfval -p`;
+my @values = `${exec_prefix}/innconfval -p`;
 foreach $line (@values) {
   eval 'our '.$line;
   if ($line =~ /^(.*?) = /m) {


Index: inn-cron-expire
===================================================================
RCS file: /cvs/extras/rpms/inn/F-13/inn-cron-expire,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- inn-cron-expire	24 Apr 2008 15:47:14 -0000	1.5
+++ inn-cron-expire	2 Jul 2010 12:04:09 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 /sbin/chkconfig innd || exit 0
-runuser -m news -c "unset LANG; unset LC_COLLATE; /usr/lib/news/bin/news.daily delayrm"
+runuser -m news -c "unset LANG; unset LC_COLLATE; /usr/libexec/news/news.daily delayrm"


Index: inn-cron-nntpsend
===================================================================
RCS file: /cvs/extras/rpms/inn/F-13/inn-cron-nntpsend,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- inn-cron-nntpsend	24 Apr 2008 15:47:14 -0000	1.5
+++ inn-cron-nntpsend	2 Jul 2010 12:04:09 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 /sbin/chkconfig innd || exit 0
-runuser -m news -c "unset LANG; unset LC_COLLATE; /usr/lib/news/bin/nntpsend"
+runuser -m news -c "unset LANG; unset LC_COLLATE; /usr/libexec/news/nntpsend"


Index: inn-cron-rnews
===================================================================
RCS file: /cvs/extras/rpms/inn/F-13/inn-cron-rnews,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- inn-cron-rnews	24 Apr 2008 15:47:14 -0000	1.5
+++ inn-cron-rnews	2 Jul 2010 12:04:09 -0000	1.6
@@ -1,3 +1,3 @@
 #!/bin/sh
 /sbin/chkconfig innd || exit 0
-runuser -m news -c 'unset LANG; unset LC_COLLATE; /usr/lib/news/bin/rnews -U'
+runuser -m news -c 'unset LANG; unset LC_COLLATE; /usr/libexec/news/rnews -U'


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/F-13/inn.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- inn.spec	16 Dec 2009 14:55:32 -0000	1.75
+++ inn.spec	2 Jul 2010 12:04:09 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -22,8 +22,9 @@ Patch10: inn-2.5.1-nologinshell.patch
 Patch13: inn-2.5.0-chown.patch
 Patch14: inn-redhat_build.patch
 Patch15: inn-shared.patch
+Patch16: inn-2.5.1-config-path.patch
 BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
-BuildRequires: perl(ExtUtils::Embed)
+BuildRequires: perl(ExtUtils::Embed) flex
 Requires(pre): shadow-utils
 Requires: chkconfig, grep, coreutils, sed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -100,6 +101,7 @@ exit 0
 %patch13 -p1 -b .chown
 %patch14 -p1 -b .redhat_build
 %patch15 -p1 -b .shared
+%patch16 -p1 -b .config-path
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -453,7 +455,7 @@ fi
 %{_libexecdir}/news/innshellvars
 %{_libexecdir}/news/innshellvars.tcl
 
-%dir %{_sharedstatedir}/news/http
+%attr(0775,root,news) %dir %{_sharedstatedir}/news/http
 %{_sharedstatedir}/news/http/innreport.css
 
 %dir %{perl_vendorlib}/INN
@@ -471,7 +473,7 @@ fi
 %dir /var/log/news/OLD
 %dir %{_sharedstatedir}/news/tmp
 %dir /var/run/news
-%defattr(0644,root,root,-)
+%defattr(-,root,root,-)
 %{_mandir}/man1/c*.1.gz
 %{_mandir}/man1/f*.1.gz
 %{_mandir}/man1/g*.1.gz
@@ -485,7 +487,6 @@ fi
 %doc doc/config-design doc/history-innfeed doc/GPL doc/sample-control
 %doc doc/config-semantics doc/external-auth TODO doc/hook-python doc/config-syntax
 %doc doc/hook-perl doc/history
-%defattr(0755,root,root,-)
 %doc %dir samples
 
 %files libs
@@ -507,7 +508,14 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
-* Wed Dec 16 2009 Nikola Pajkovsky <npajkovs at redhta.com> - 2.5.1-3
+* Wed Jun 2 2010 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.1-4
+- Resolves: #597799 - Two typos in /etc/init.d/inn, three typos in /etc/cron.*/inn* in F13
+- Resolves: #596580 - Migration from /usr/lib/news/bin to /usr/libexec/news is not complete
+- Resolves: #604473 - wrong permissions on /usr/share/doc/inn-2.5.1(Jochen at herr-schmitt.de)
+- add patch inn-2.5.1-config-path.patch
+- add BuildRequires: flex (Jochen at herr-schmitt.de)
+
+* Wed Dec 16 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.1-3
 - rebuild 
 - chage licence and remove on rm -f
 - drop patches inn-2.4.1.perl.patch and inn-2.4.5-dynlib.patch


Index: innd.init
===================================================================
RCS file: /cvs/extras/rpms/inn/F-13/innd.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- innd.init	13 Jul 2009 13:53:29 -0000	1.8
+++ innd.init	2 Jul 2010 12:04:09 -0000	1.9
@@ -30,7 +30,7 @@ RETVAL=0
 
 [ -d /etc/news ] || exit 1
 [ -f /etc/news/inn.conf ] || exit 6
-. /usr/lib/news/lib/innshellvars || exit 1
+. /usr/libexec/news/innshellvars || exit 1
  
 start() {
   # Check that networking is up.
@@ -44,7 +44,7 @@ start() {
   # INN uses too many un-checked shell scripts
   unset LANG
   unset LC_COLLATE
-  daemon --user news /etc/rc.news
+  daemon --user news /usr/libexec/news/rc.news
   RETVAL=$?
   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/innd
   echo

More information about the scm-commits mailing list