rpms/inn/F-9 inn.spec,1.46,1.47

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/inn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1786

Modified Files:
	inn.spec 
Log Message:
create user/group news with reserved uidgid numbers (#498702), versioned provide for perl(::/usr/lib/innshellvars.pl) , fix upstream url, own all dirs spawned by inn package, no static libraries, mark /usr/lib/news/lib/innshellvars* as config(noreplace)


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/F-9/inn.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- inn.spec	19 May 2008 14:11:07 -0000	1.46
+++ inn.spec	11 May 2009 18:39:51 -0000	1.47
@@ -1,11 +1,11 @@
-Summary: The InterNetNews (INN) system, an Usenet news server
+Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?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/
+URL: https://www.isc.org/software/INN/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
 Source2: inn-default-distributions
 Source4: inn-cron-expire
@@ -24,12 +24,13 @@ Patch9: inn-2.4.3.rcreaderaddrinuse.patc
 Patch10: inn-2.4.3-nologinshell.patch
 BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
 BuildRequires: perl(ExtUtils::Embed)
+Requires(pre): shadow-utils
 Prereq: chkconfig, grep, coreutils, sed
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: bash >= 2.0, inews
 
 # XXX white out bogus perl requirement for now
-Provides: perl(::usr/lib/innshellvars.pl)
+Provides: perl(::usr/lib/innshellvars.pl) = %{version}-%{release}
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -106,6 +107,7 @@ with_tmp_path=/var/lib/news/tmp ./config
   --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}
 
 # XXX don't include <db1/ndbm.h> to avoid linking with -ldb1.
@@ -118,13 +120,6 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Shift libs to the right place
-if [ "/usr/lib" != "%{_libdir}" ]; then
-    mkdir -p $RPM_BUILD_ROOT%{_libdir}/news/lib
-    mv $RPM_BUILD_ROOT/usr/lib/news/lib/*.a $RPM_BUILD_ROOT%{_libdir}/news/lib
-fi
-
-
 # -- Install man pages needed by suck et al.
 mkdir -p $RPM_BUILD_ROOT/usr/include/inn
 
@@ -174,6 +169,19 @@ 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
+
 #Build filelist
 rm -rf $RPM_BUILD_ROOT/usr/lib/news/include
 echo "%defattr(-,news,news)" > files.list
@@ -184,7 +192,7 @@ find $RPM_BUILD_ROOT -type f -or -type l
   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 &|' | \
+  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|' | \
@@ -202,6 +210,13 @@ find $RPM_BUILD_ROOT -type f -or -type l
 rm -rf $RPM_BUILD_ROOT
 rm -f files.list files.main files.devel files.inews
 
+%pre
+getent group news >/dev/null || groupadd -g 13 -r news
+getent passwd news >/dev/null || \
+useradd -r -u 9 -g news -d /etc/news -s /sbin/nologin \
+-c "News server user" news
+exit 0
+
 %post
 /sbin/chkconfig --add innd
 su -m news -c '/usr/lib/news/bin/makedbz -i -o'
@@ -282,10 +297,19 @@ exit 0
 
 %files -f files.main
 %defattr(-,news,news,-)
-%dir /usr/lib/news/bin/control
-%dir /usr/lib/news/bin/filter
+%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
 %dir /usr/lib/news/bin/auth
+%dir /usr/lib/news/bin/auth/passwd
+%dir /usr/lib/news/bin/auth/resolv
+%dir /usr/lib/news/bin/filter
+%dir /usr/lib/news/bin/control
+%if "(_libdir}" != "/usr/lib"
+%dir %{_libdir}/news
+%endif
 %dir /etc/news
 %dir /var/spool/news
 %dir /var/spool/news/archive
@@ -315,6 +339,7 @@ exit 0
 
 %files devel -f files.devel
 %defattr(-,root,root)
+%dir /usr/include/inn
 %{_mandir}/man3/*
 
 %files -n inews
@@ -325,6 +350,16 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Mon May 11 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.4-2
+- create user/group news with reserved uidgid numbers
+  (#498702)
+- mark /usr/lib/news/lib/innshellvars* as noreplace,
+  versioned provide for perl(::/usr/lib/innshellvars.pl)
+- fix upstream url
+- do own /usr/include/inn in devel package (#473922)
+- do not use static libraries(changes by Jochen Schmitt,#453993)
+- own all dirs spawned by inn package(#448088)
+
 * Thu May 15 2008 Ondrej Vasik <ovasik at redhat.com> - 2.4.4-1
 - new upstream release 2.4.4 
  (required becaused of Perl-5.10 in F9, #446487)