[rpms/inn] epel10.3: #225901 - Merge Review: inn

[Nikola Pajkovsky <npajkovs@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10.3
Commit : 29b1f5c307a62873265a140d2b7341fd9c749cbc
Author : Nikola Pajkovsky <npajkovs@fedoraproject.org>
Date   : 2009-12-11T16:48:14+00:00
Stats  : +295/-381 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/29b1f5c307a62873265a140d2b7341fd9c749cbc?branch=epel10.3

Log:
#225901 - Merge Review: inn

---
diff --git a/inn-2.4.1.pie.patch b/inn-2.4.1.pie.patch
deleted file mode 100644
index eed9f7a..0000000
--- a/inn-2.4.1.pie.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- inn-2.4.1/frontends/Makefile.pie	2004-12-13 13:09:57.000000000 +0100
-+++ inn-2.4.1/frontends/Makefile	2004-12-13 15:12:09.161681704 +0100
-@@ -79,7 +79,7 @@
- ovdb_monitor:	ovdb_monitor.o $(BOTH)   ; $(LINK) ovdb_monitor.o $(STORELIBS)
- ovdb_server:	ovdb_server.o  $(BOTH)   ; $(LINK) ovdb_server.o  $(STORELIBS)
- ovdb_stat:	ovdb_stat.o    $(BOTH)   ; $(LINK) ovdb_stat.o    $(STORELIBS)
--rnews:		rnews.o        $(LIBINN) ; $(LINK) rnews.o        $(STORELIBS)
-+rnews:		rnews.o        $(LIBINN) ; $(LINK) rnews.o        -pie $(STORELIBS)
- sm:		sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
- 
- ovdb_init.o: ovdb_init.c
---- inn-2.4.1/innd/Makefile.pie	2004-12-13 13:09:57.000000000 +0100
-+++ inn-2.4.1/innd/Makefile	2004-12-13 15:16:25.808665432 +0100
-@@ -44,7 +44,7 @@
- python.o:	python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
- 
- innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
--	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
-+	$(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
- 
- tinyleaf: tinyleaf.o $(LIBINN)
- 	$(LIBLD) $(LDFLAGS) -o $@ tinyleaf.o $(LIBINN)

diff --git a/inn-2.4.3-nologinshell.patch b/inn-2.4.3-nologinshell.patch
deleted file mode 100644
index 7158fa7..0000000
--- a/inn-2.4.3-nologinshell.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -urNp inn-2.4.3-orig/doc/man/rc.news.8 inn-2.4.3/doc/man/rc.news.8
---- inn-2.4.3-orig/doc/man/rc.news.8	2008-04-09 16:22:16.000000000 +0200
-+++ inn-2.4.3/doc/man/rc.news.8	2008-04-09 16:31:42.000000000 +0200
-@@ -178,20 +178,20 @@ is recommended to throttle the server fi
- To start \s-1INN\s0 and leave certain error messages going to the terminal:
- .PP
- .Vb 1
--\&       su \- news \-c <pathbin in inn.conf>/rc.news
-+\&       su \-m news \-c /etc/rc.news
- .Ve
- .PP
- To run \s-1INN\s0 at startup time from appropriate system boot scripts:
- .PP
- .Vb 1
--\&       su \- news \-c <pathbin>/rc.news >/dev/console
-+\&       su \-m news \-c /etc/rc.news >/dev/console
- .Ve
- .PP
- To stop \s-1INN\s0 (throttling first):
- .PP
- .Vb 2
- \&       <pathbin>/ctlinnd throttle reason
--\&       su \- news \-c '<pathbin>/rc.news stop'
-+\&       su \-m news \-c '/etc/rc.news stop'
- .Ve
- .SH "BUGS"
- .IX Header "BUGS"
-diff -urNp inn-2.4.3-orig/doc/pod/install.pod inn-2.4.3/doc/pod/install.pod
---- inn-2.4.3-orig/doc/pod/install.pod	2008-04-09 16:22:16.000000000 +0200
-+++ inn-2.4.3/doc/pod/install.pod	2008-04-09 16:32:22.000000000 +0200
-@@ -1489,7 +1489,7 @@ INN is started via the shell script F<rc
- news user and not as root.  To start INN on system boot, you therefore
- want to put something like:
- 
--    su news -c <pathbin in inn.conf>/rc.news
-+    su -m news -c /etc/rc.news
- 
- in the system boot scripts.  If B<innd> is stopped or killed, you can restart
- it by running B<rc.news> by hand as the news user.
-@@ -1497,7 +1497,7 @@ it by running rc.news by hand as the new
- The B<rc.news> script may also be used to shut down INN, with the C<stop>
- option:
- 
--    su news -c '<pathbin in inn.conf>/rc.news stop'
-+    su -m news -c '/etc/rc.news stop'
- 
- In the F<contrib> directory of this source tree is a sample init script
- for people using System V-style init.d directories.
-diff -urNp inn-2.4.3-orig/doc/pod/rc.news.pod inn-2.4.3/doc/pod/rc.news.pod
---- inn-2.4.3-orig/doc/pod/rc.news.pod	2008-04-09 16:22:16.000000000 +0200
-+++ inn-2.4.3/doc/pod/rc.news.pod	2008-04-09 16:32:48.000000000 +0200
-@@ -65,16 +65,16 @@ is recommended to throttle the server fi
- 
- To start INN and leave certain error messages going to the terminal:
- 
--       su - news -c <pathbin in inn.conf>/rc.news
-+       su -m news -c /etc/rc.news
- 
- To run INN at startup time from appropriate system boot scripts:
- 
--       su - news -c <pathbin>/rc.news >/dev/console
-+       su -m news -c /etc/rc.news >/dev/console
- 
- To stop INN (throttling first):
- 
-        <pathbin>/ctlinnd throttle reason
--       su - news -c '<pathbin>/rc.news stop'
-+       su -m news -c '/etc/rc.news stop'
- 
- =head1 BUGS
- 
-diff -urNp inn-2.4.3-orig/INSTALL inn-2.4.3/INSTALL
---- inn-2.4.3-orig/INSTALL	2008-04-09 16:22:16.000000000 +0200
-+++ inn-2.4.3/INSTALL	2008-04-09 16:30:24.000000000 +0200
-@@ -1455,7 +1455,7 @@ Starting and Stopping the System
-     news user and not as root.  To start INN on system boot, you therefore
-     want to put something like:
- 
--        su news -c <pathbin in inn.conf>/rc.news
-+        su -m news -c /etc/rc.news
- 
-     in the system boot scripts.  If innd is stopped or killed, you can
-     restart it by running rc.news by hand as the news user.
-@@ -1463,7 +1463,7 @@ Starting and Stopping the System
-     The rc.news script may also be used to shut down INN, with the "stop"
-     option:
- 
--        su news -c '<pathbin in inn.conf>/rc.news stop'
-+        su -m news -c '/etc/rc.news stop'
- 
-     In the contrib directory of this source tree is a sample init script for
-     people using System V-style init.d directories.

diff --git a/inn-redhat_build.patch b/inn-redhat_build.patch
new file mode 100644
index 0000000..e8c8591
--- /dev/null
+++ b/inn-redhat_build.patch
@@ -0,0 +1,32 @@
+diff -up inn-2.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
+--- inn-2.5.1/scripts/Makefile.redhat_build	2009-12-01 14:06:00.977311656 +0100
++++ inn-2.5.1/scripts/Makefile	2009-12-01 14:06:00.977311656 +0100
+@@ -27,7 +27,7 @@ install: all
+ 	done
+ 	for F in innreport_inn.pm innshellvars innshellvars.pl \
+ 	         innshellvars.tcl ; do \
+-	    $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
++	    $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
+ 	done
+ 
+ bootstrap:
+diff -up inn-2.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
+--- inn-2.5.1/support/fixscript.in.redhat_build	2009-12-01 14:18:13.664811185 +0100
++++ inn-2.5.1/support/fixscript.in	2009-12-01 14:18:50.024811262 +0100
+@@ -26,6 +26,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ libperldir="@LIBPERLDIR@"
++libexecdir="@libexecdir@"
+ 
+ # We can probably just assume sed is on the path, but since we have it, we may
+ # as well use it.
+@@ -60,7 +61,7 @@ interpreter=`head -n 1 "$input"`
+ case "$interpreter" in
+ */sh|*SH*)
+     path="@SHELL@"
+-    lib=". $libdir/innshellvars"
++    lib=". $libexecdir/news/innshellvars"
+     ;;
+ */perl*|*PERL*)
+     path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`

diff --git a/inn-shared.patch b/inn-shared.patch
new file mode 100644
index 0000000..4dad12b
--- /dev/null
+++ b/inn-shared.patch
@@ -0,0 +1,32 @@
+diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buffindexed/ovmethod.mk
+--- inn-2.5.1/storage/buffindexed/ovmethod.mk.shared	2009-12-01 16:50:37.174811272 +0100
++++ inn-2.5.1/storage/buffindexed/ovmethod.mk	2009-12-01 16:53:24.914809560 +0100
+@@ -1,9 +1,9 @@
+ # This rule requires a compiler that supports -o with -c.  Since it's normally
+ # used by developers, that should be acceptable.
+-buffindexed/buffindexed_d.o: buffindexed/buffindexed.c
+-	$(CC) $(CFLAGS) -DBUFF_DEBUG -c -o $@ buffindexed/buffindexed.c
++buffindexed/buffindexed_d.$(EXTOBJ): buffindexed/buffindexed.c
++	$(LIBCC) $(CFLAGS) -DBUFF_DEBUG -c -o $@ buffindexed/buffindexed.c
+ 
+-buffindexed/buffindexed_d: buffindexed/buffindexed_d.o libstorage.$(EXTLIB) $(LIBHIST)
+-	$(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.o \
+-	    buffindexed/shmem.o expire.o ov.o \
++buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
++	$(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
++	    buffindexed/shmem.$(EXTOBJ) expire.$(EXTOBJ) ov.$(EXTOBJ) \
+ 	    $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
+diff -up inn-2.5.1/storage/tradindexed/ovmethod.mk.shared inn-2.5.1/storage/tradindexed/ovmethod.mk
+--- inn-2.5.1/storage/tradindexed/ovmethod.mk.shared	2009-12-01 16:53:35.644811390 +0100
++++ inn-2.5.1/storage/tradindexed/ovmethod.mk	2009-12-01 16:53:59.964810001 +0100
+@@ -1,6 +1,6 @@
+-tradindexed/tdx-util.o: tradindexed/tdx-util.c
+-	$(CC) $(CFLAGS) -c -o $@ tradindexed/tdx-util.c
++tradindexed/tdx-util.$(EXTOBJ): tradindexed/tdx-util.c
++	$(LIBCC) $(CFLAGS) -c -o $@ tradindexed/tdx-util.c
+ 
+-tradindexed/tdx-util: tradindexed/tdx-util.o libstorage.$(EXTLIB) $(LIBHIST)
+-	$(LIBLD) $(LDFLAGS) -o $@ tradindexed/tdx-util.o \
++tradindexed/tdx-util: tradindexed/tdx-util.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
++	$(LIBLD) $(LDFLAGS) -o $@ tradindexed/tdx-util.$(EXTOBJ) \
+ 	    $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)

diff --git a/inn.spec b/inn.spec
index 284477b..bb33a78 100644
--- a/inn.spec
+++ b/inn.spec
@@ -22,7 +22,9 @@ Patch8: inn-2.4.2-makedbz.patch
 Patch10: inn-2.5.1-nologinshell.patch
 Patch11: inn-2.4.5-dynlib.patch
 Patch13: inn-2.5.0-chown.patch
-BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
+Patch14: inn-redhat_build.patch
+Patch15: inn-shared.patch
+BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
 BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
 Requires: chkconfig, grep, coreutils, sed
@@ -74,6 +76,13 @@ specified in the inn.conf file.
 Install inews if you need a program for posting Usenet articles to
 local news servers.
 
+%package libs
+Summary: Libraries provided by INN
+Group: Applications/System
+
+%description libs
+This package contains dynamic libraries provided by INN project
+
 %pre
 getent group news >/dev/null || groupadd -g 13 -r news
 getent passwd news >/dev/null || \
@@ -82,128 +91,119 @@ useradd -r -u 9 -g news -d /etc/news -s /sbin/nologin \
 exit 0
 
 %prep
-%setup  -q  -a 10
+%setup -q
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .perl
+#%patch2 -p1 -b .perl
 %patch4 -p1 -b .pie
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .makedbz
 %patch10 -p1 -b .nologin
-%patch11 -p1 -b .dynlib
+#%patch11 -p1 -b .dynlib
 %patch13 -p1 -b .chown
+%patch14 -p1 -b .redhat_build
+%patch15 -p1 -b .shared
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
 
 %build
 export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -DHAVE_ET_COM_ERR_H"
+export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 %ifarch s390 s390x sparc sparcv9 sparc64
-export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="$CFLAGS -fPIC"
 %else
-export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fno-strict-aliasing -fpic -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="$CFLAGS -fpic"
 %endif
 
-with_tmp_path=/var/lib/news/tmp ./configure \
-  --prefix=/usr/lib/news \
-  --sysconfdir=/etc/news --mandir=%{_mandir} \
+%configure --bindir=%{_libexecdir}/news \
+  --sysconfdir=%{_sysconfdir}/news --exec-prefix=%{_libexecdir}/news \
   --with-log-dir=/var/log/news --with-spool-dir=/var/spool/news\
-  --with-db-dir=/var/lib/news --with-run-dir=/var/run/news \
-  --with-etc-dir=/etc/news --with-tmp-dir=/var/lib/news/tmp \
+  --with-db-dir=%{_sharedstatedir}/news --with-run-dir=/var/run/news \
+  --with-etc-dir=%{_sysconfdir}/news --with-tmp-dir=%{_sharedstatedir}/news/tmp \
   --with-perl --enable-shared --enable-uucp-rnews \
+  --with-libperl-dir=%{perl_vendorlib} \
   --enable-pgp-verify --with-sendmail=/usr/sbin/sendmail \
   --with-news-user=news --with-news-group=news --with-news-master=news \
-  --enable-ipv6 \
-  --enable-libtool \
-  %{_target_platform}
+  --enable-ipv6 --with-http-dir=%{_sharedstatedir}/news/http \
+  --enable-libtool --disable-static --with-pic
 
-# XXX don't include <db1/ndbm.h> to avoid linking with -ldb1.
-perl -pi -e 's/HAVE_DB1_NDBM_H/XXX_HAVE_DB1_NDBM_H/' ./include/config.h
+# Don't hardcode rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/news/http
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # -- Install man pages needed by suck et al.
-mkdir -p $RPM_BUILD_ROOT/usr/include/inn
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/inn
 
 for f in clibrary.h config.h
 do
-    install -c -m 0644 ./include/$f $RPM_BUILD_ROOT/usr/include/inn
+    install -p -m 0644 ./include/$f $RPM_BUILD_ROOT%{_includedir}/inn
 done
 for f in defines.h system.h libinn.h storage.h options.h dbz.h
 do
-    install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn
+    install -p -m 0644 ./include/inn/$f $RPM_BUILD_ROOT%{_includedir}/inn
 done
 
-mkdir -p $RPM_BUILD_ROOT/etc
-mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc
-
-touch     $RPM_BUILD_ROOT/var/lib/news/subscriptions
-chmod 644 $RPM_BUILD_ROOT/var/lib/news/subscriptions
+touch     $RPM_BUILD_ROOT%{_sharedstatedir}/news/subscriptions
+chmod 644 $RPM_BUILD_ROOT%{_sharedstatedir}/news/subscriptions
 
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/news/distributions
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sharedstatedir}/news/distributions
 
-mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.daily/inn-cron-expire
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.hourly/inn-cron-rnews
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/cron.hourly/inn-cron-nntpsend
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.{hourly,daily}
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/inn-cron-expire
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/inn-cron-rnews
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/inn-cron-nntpsend
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/innd
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install %{SOURCE8} $RPM_BUILD_ROOT%{_initrddir}/innd
 
 tar xf %{SOURCE10}
 mv inn.html FAQ.html
 
-touch $RPM_BUILD_ROOT/var/lib/news/history
+touch $RPM_BUILD_ROOT%{_sharedstatedir}/news/history
 #LD_LIBRARY_PATH=$RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/bin/makedbz -i \
 # -f $RPM_BUILD_ROOT/var/lib/news/history
 #chmod 644 $RPM_BUILD_ROOT/var/lib/news/*
 
-cat > $RPM_BUILD_ROOT/etc/news/.profile <<EOF
-PATH=\$PATH:/usr/lib/news/bin
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/news/.profile <<EOF
+PATH=\$PATH:%{_libexecdir}/news
 export PATH
 EOF
 
 # we get this from cleanfeed
-rm -f $RPM_BUILD_ROOT/usr/lib/news/bin/filter/filter_innd.pl
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
 
 #Fix perms in sample directory to avoid bogus dependencies
 find samples -name "*.in" -exec chmod a-x {} \;
 
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-ln -sf ../lib/news/bin/inews $RPM_BUILD_ROOT/usr/bin/inews
-ln -sf ../lib/news/bin/rnews $RPM_BUILD_ROOT/usr/bin/rnews
-
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.la
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/lib/*.a
-
-%if "%{_libdir}" != "/usr/lib"
-rm -rf $RPM_BUILD_ROOT%{_libdir}/news/lib/*.a
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/news/lib
-mv $RPM_BUILD_ROOT/usr/lib/news/lib/*.so* $RPM_BUILD_ROOT%{_libdir}/news/lib
-%endif
-
-mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/
-
-echo '%{_libdir}/news/lib' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/inn-%{_arch}.conf
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
+ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
 
-rm -rf $RPM_BUILD_ROOT/usr/lib/news/include
+# Remove unwanted files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 
+# Documentation is installed via rpm %%doc directive
+rm -rf $RPM_BUILD_ROOT/usr/doc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -f files.list files.main files.devel files.inews
 
 %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'
+su -m news -c '/usr/libexec/news/makedbz -i -o'
 
 umask 002
 touch /var/log/news/news.notice
@@ -211,10 +211,10 @@ touch /var/log/news/news.crit
 touch /var/log/news/news.err
 chown -R news:news /var/log/news*
 
+%post libs -p /sbin/ldconfig
+
 %triggerpostun -- inn < 2.3.0
 service innd stop > /dev/null 2>&1
-exit 0
-
 
 %triggerin -- rsyslog
 if [ -f /etc/rsyslog.conf ]; then
@@ -274,24 +274,23 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" -ge 1 ]; then
     service innd condrestart > /dev/null 2>&1
 fi
-exit 0
 
-%files
-%defattr(-,news,news,-)
-/usr/bin/rnews
+%postun libs -p /sbin/ldconfig
 
+%files
+%defattr(0755,news,news,-)
+%{_bindir}/rnews
+%defattr(0755,root,root,-)
 # /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
+%{_initrddir}/innd
+%{_sysconfdir}/cron.hourly/inn-cron-rnews
+%{_sysconfdir}/cron.hourly/inn-cron-nntpsend
+%{_sysconfdir}/cron.daily/inn-cron-expire
 
+%defattr(-,news,news,-)
 # /etc/news config files
 %dir %{_sysconfdir}/news
 %config(noreplace) %{_sysconfdir}/news/passwd.nntp
@@ -324,181 +323,147 @@ exit 0
 %config(noreplace) %{_sysconfdir}/news/readers.conf
 %config(noreplace) %{_sysconfdir}/news/distributions
 
-%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
-/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
-/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
-%{_libdir}/news/lib/libinnhist.so.2
-%{_libdir}/news/lib/libinnhist.so.2.0.0
-%{_libdir}/news/lib/libinnhist.so
-%{_libdir}/news/lib/libstorage.so
-%{_libdir}/news/lib/libstorage.so.2
-%{_libdir}/news/lib/libstorage.so.2.0.0
-%{_libdir}/news/lib/libinn.so
-%{_libdir}/news/lib/libinn.so.2
-%{_libdir}/news/lib/libinn.so.2.0.0
-
-%config(noreplace) /usr/lib/news/lib/innshellvars.pl
-%config(noreplace) /usr/lib/news/lib/innshellvars
-%config(noreplace) /usr/lib/news/lib/innshellvars.tcl
-
-%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 %{_sharedstatedir}/news
+%config(noreplace) %{_sharedstatedir}/news/active.times
+%config(noreplace) %{_sharedstatedir}/news/distributions
+%config(noreplace) %{_sharedstatedir}/news/newsgroups
+%config(noreplace) %{_sharedstatedir}/news/active
+%config(noreplace) %{_sharedstatedir}/news/subscriptions
+%config(noreplace) %{_sharedstatedir}/news/history
+
+%defattr(0755,root,news,-)
+%dir %{_libexecdir}/news
+%{_libexecdir}/news/controlbatch
+%attr(4510,root,news) %{_libexecdir}/news/innbind
+%{_libexecdir}/news/docheckgroups
+%{_libexecdir}/news/imapfeed
+%{_libexecdir}/news/send-nntp
+%{_libexecdir}/news/actmerge
+%{_libexecdir}/news/ovdb_server
+%{_libexecdir}/news/filechan
+%{_libexecdir}/news/ninpaths
+%{_libexecdir}/news/mod-active
+%{_libexecdir}/news/news2mail
+%{_libexecdir}/news/innconfval
+%{_libexecdir}/news/shlock
+%{_libexecdir}/news/nnrpd
+%{_libexecdir}/news/controlchan
+%{_libexecdir}/news/procbatch
+%{_libexecdir}/news/expire
+%{_libexecdir}/news/convdate
+%{_libexecdir}/news/pullnews
+%{_libexecdir}/news/archive
+%{_libexecdir}/news/cnfsstat
+%{_libexecdir}/news/grephistory
+%{_libexecdir}/news/send-ihave
+%{_libexecdir}/news/tinyleaf
+%{_libexecdir}/news/cvtbatch
+%{_libexecdir}/news/expirerm
+%{_libexecdir}/news/rc.news
+%attr(4550,uucp,news) %{_libexecdir}/news/rnews
+%{_libexecdir}/news/innxmit
+%{_libexecdir}/news/actsyncd
+%{_libexecdir}/news/shrinkfile
+%{_libexecdir}/news/makedbz
+%{_libexecdir}/news/actsync
+%{_libexecdir}/news/pgpverify
+%{_libexecdir}/news/inndf
+%{_libexecdir}/news/scanlogs
+%{_libexecdir}/news/simpleftp
+%{_libexecdir}/news/ovdb_init
+%{_libexecdir}/news/ctlinnd
+%{_libexecdir}/news/innstat
+%{_libexecdir}/news/send-uucp
+%{_libexecdir}/news/buffchan
+%{_libexecdir}/news/perl-nocem
+%{_libexecdir}/news/scanspool
+%{_libexecdir}/news/expireover
+%{_libexecdir}/news/batcher
+%{_libexecdir}/news/fastrm
+%{_libexecdir}/news/innmail
+%{_libexecdir}/news/innxbatch
+%{_libexecdir}/news/buffindexed_d
+%{_libexecdir}/news/nntpget
+%{_libexecdir}/news/cnfsheadconf
+%{_libexecdir}/news/ovdb_stat
+%{_libexecdir}/news/prunehistory
+%{_libexecdir}/news/innreport
+%attr(0644,root,news) %{_libexecdir}/news/innreport_inn.pm
+%{_libexecdir}/news/getlist
+%{_libexecdir}/news/innd
+%{_libexecdir}/news/innupgrade
+%{_libexecdir}/news/news.daily
+%{_libexecdir}/news/sm
+%{_libexecdir}/news/innwatch
+%{_libexecdir}/news/inncheck
+%{_libexecdir}/news/writelog
+%{_libexecdir}/news/signcontrol
+%{_libexecdir}/news/tdx-util
+%{_libexecdir}/news/tally.control
+%{_libexecdir}/news/overchan
+%{_libexecdir}/news/sendinpaths
+%{_libexecdir}/news/makehistory
+%{_libexecdir}/news/nntpsend
+%{_libexecdir}/news/mailpost
+%{_libexecdir}/news/innfeed
+%{_libexecdir}/news/ovdb_monitor
+%{_libexecdir}/news/sendxbatches
+
+%define filterdir %{_libexecdir}/news/filter
+%dir %{filterdir}
+%{filterdir}/filter_nnrpd.pl
+%{filterdir}/nnrpd_access.pl
+%{filterdir}/startup_innd.pl
+%{filterdir}/nnrpd_auth.py*
+%{filterdir}/nnrpd_access.py*
+%{filterdir}/nnrpd_auth.pl
+%{filterdir}/INN.py*
+%{filterdir}/nnrpd.py*
+%{filterdir}/filter_innd.py*
+%{filterdir}/nnrpd_dynamic.py*
+
+%define authdir %{_libexecdir}/news/auth
+%define passwddir %{authdir}/passwd
+%dir %{authdir}
+%dir %{passwddir}
+%{passwddir}/radius
+%{passwddir}/ckpasswd
+
+%define resolvdir %{authdir}/resolv
+%dir %{resolvdir}
+%{resolvdir}/domain
+%{resolvdir}/ident
+
+%define controldir %{_libexecdir}/news/control
+%dir %{controldir}
+%{controldir}/version.pl
+%{controldir}/ihave.pl
+%{controldir}/sendsys.pl
+%{controldir}/sendme.pl
+%{controldir}/checkgroups.pl
+%{controldir}/senduuname.pl
+%{controldir}/newgroup.pl
+%{controldir}/rmgroup.pl
+
+%define rnewsdir %{_libexecdir}/news/rnews.libexec
+%dir %{rnewsdir}
+%{rnewsdir}/encode
+%{rnewsdir}/gunbatch
+%{rnewsdir}/decode
+%{rnewsdir}/bunbatch
+%{rnewsdir}/c7unbatch
+
+%{_libexecdir}/news/innshellvars.pl
+%{_libexecdir}/news/innshellvars
+%{_libexecdir}/news/innshellvars.tcl
+
+%dir %{_sharedstatedir}/news/http
+%{_sharedstatedir}/news/http/innreport.css
+
+%dir %{perl_vendorlib}/INN
+%{perl_vendorlib}/INN/Config.pm
+
+%defattr(-,news,news,-)
 %dir /var/spool/news
 %dir /var/spool/news/archive
 %dir /var/spool/news/articles
@@ -508,9 +473,9 @@ exit 0
 %dir /var/spool/news/outgoing
 %dir /var/spool/news/overview
 %dir /var/log/news/OLD
-%dir /var/lib/news/tmp
+%dir %{_sharedstatedir}/news/tmp
 %dir /var/run/news
-%defattr(-,root,root)
+%defattr(0644,root,root,-)
 %{_mandir}/man1/c*.1.gz
 %{_mandir}/man1/f*.1.gz
 %{_mandir}/man1/g*.1.gz
@@ -520,35 +485,34 @@ exit 0
 %{_mandir}/man1/r*.1.gz
 %{_mandir}/man1/s*.1.gz
 %{_mandir}/man[58]/*
-%doc NEWS README* ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html
+%doc NEWS README* HACKING ChangeLog CONTRIBUTORS LICENSE INSTALL FAQ.html 
+%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
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+
 %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/include/inn/options.h
-%{_libdir}/news/lib/libstorage.so
-%{_libdir}/news/lib/libinn.so
-%{_libdir}/news/lib/libinnhist.so
+%defattr(-,root,root,-)
+%dir %{_includedir}/inn/
+%{_includedir}/inn/*
+%{_libdir}/lib*.so
 %{_mandir}/man3/*
 
 %files -n inews
-%defattr(-,root,root)
-%config(noreplace) %attr(-,news,news) /etc/news/inn.conf
-/usr/bin/inews
-%attr(0755,root,root) /usr/lib/news/bin/inews
+%defattr(-,root,root,-)
+%config(noreplace) %attr(-,news,news) %{_sysconfdir}/news/inn.conf
+%{_bindir}/inews
+%attr(0755,root,root) %{_libexecdir}/news/inews
 %{_mandir}/man1/inews*
 
 %changelog
-* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 2.5.1-2
-- rebuild against perl 5.10.1
+* Fri Dec 11 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 2.5.1-2
+- #225901 - Merge Review: inn
 
 * Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.1-1
 - New upstream release
@@ -565,7 +529,7 @@ exit 0
 
 * Wed Jun 24 2009 Ondrej Vasik <ovasik@redhat.com> - 2.5.0-2
 - add support for load average to makehistory(#276061)
-- update faq, ship it in %doc
+- update faq, ship it in %%doc
 - fix typo in filelist
 
 * Tue Jun 09 2009 Ondrej Vasik <ovasik@redhat.com> - 2.5.0-1