rpms/inn/devel inn.spec,1.48,1.49

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	inn.spec 
Log Message:
do not use static libraries(changes by Jochen Schmitt, #453993), own all dirs spawned by inn package(#448088)


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- inn.spec	3 Jul 2008 16:16:38 -0000	1.48
+++ inn.spec	10 Jul 2008 16:16:42 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server
 Name: inn
 Version: 2.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -22,6 +22,7 @@
 Patch8: inn-2.4.2-makedbz.patch
 Patch9: inn-2.4.3.rcreaderaddrinuse.patch
 Patch10: inn-2.4.3-nologinshell.patch
+Patch11: inn-2.4.5-dynlib.patch
 BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
 BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
@@ -91,6 +92,7 @@
 %patch8 -p1 -b .makedbz
 %patch9 -p1 -b .addrinuse
 %patch10 -p1 -b .nologin
+%patch11 -p1 -b .dynlib
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -114,6 +116,7 @@
   --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.
@@ -126,13 +129,6 @@
 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
 
@@ -145,7 +141,6 @@
     install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn
 done
 
-
 mkdir -p $RPM_BUILD_ROOT/etc
 mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc
 
@@ -182,10 +177,24 @@
 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
-find $RPM_BUILD_ROOT -type f -or -type l | \
+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) &|' | \
@@ -196,7 +205,7 @@
   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 
+  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 | \
@@ -204,13 +213,14 @@
   grep -v "news/inn.conf" | \
   grep -v "/man/") > files.main
   echo "%defattr(-,root,root)" > files.devel
-  egrep "\.(h|so|a|la)$" files.list >> files.devel
+  egrep "\.(h|so)$" files.list >> files.devel
 
 %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/makedbz -i -o'
 
@@ -283,6 +293,7 @@
 fi
 
 %postun
+/sbin/ldconfig
 if [ "$1" -ge 1 ]; then
     service innd condrestart > /dev/null 2>&1
 fi
@@ -290,11 +301,20 @@
 
 %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 /etc/news
+%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
 %dir /var/spool/news/articles
@@ -333,6 +353,10 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Jul  7 2008 Ondrej Vasik <ovasik at redhat.com> - 2.4.5-2
+- do not use static libraries(changes by Jochen Schmitt,#453993)
+- own all dirs spawned by inn package(#448088)
+
 * Thu Jul  3 2008 Ondrej Vasik <ovasik at redhat.com> - 2.4.5-1
 - new upstream release 2.4.5