rpms/inn/F-9 inn-2.4.5-dynlib.patch,NONE,1.1 inn.spec,1.47,1.48

[Ondrej Vasik]

Author: ovasik

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

Modified Files:
	inn.spec 
Added Files:
	inn-2.4.5-dynlib.patch 
Log Message:
do include libstorage.so.2 and libinnhist.so.2 into package

inn-2.4.5-dynlib.patch:

--- NEW FILE inn-2.4.5-dynlib.patch ---
diff -up inn-2.4.5/history/Makefile.dynlib inn-2.4.5/history/Makefile
--- inn-2.4.5/history/Makefile.dynlib	2008-07-03 19:50:04.000000000 +0200
+++ inn-2.4.5/history/Makefile	2008-07-03 19:50:50.000000000 +0200
@@ -43,7 +43,7 @@ $(FIXSCRIPT):
 
 libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
-	    $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \
+	    $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS)  -L../lib/.libs -L../storage/.libs ${LIBS} \
 	    -rpath $(PATHLIB) -version-info 2:0:0
 
 libinnhist.a: $(OBJECTS)
diff -up inn-2.4.5/storage/Makefile.dynlib inn-2.4.5/storage/Makefile
--- inn-2.4.5/storage/Makefile.dynlib	2008-07-03 19:52:48.000000000 +0200
+++ inn-2.4.5/storage/Makefile	2008-07-03 19:42:34.000000000 +0200
@@ -47,7 +47,7 @@ $(FIXSCRIPT):
 
 libstorage.la: $(OBJECTS) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
-	    $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \
+	    $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs ${LIBS} \
 	    -rpath $(PATHLIB) -version-info 2:0:0
 
 libstorage.a: $(OBJECTS)


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/F-9/inn.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- inn.spec	11 May 2009 18:39:51 -0000	1.47
+++ inn.spec	14 May 2009 12:26:35 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -22,6 +22,7 @@ Patch7: inn-2.4.3.warn.patch
 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
@@ -84,6 +85,7 @@ local news servers.
 %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`
@@ -204,7 +206,7 @@ find $RPM_BUILD_ROOT -type f -or -type l
   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
@@ -218,6 +220,7 @@ useradd -r -u 9 -g news -d /etc/news -s 
 exit 0
 
 %post
+/sbin/ldconfig
 /sbin/chkconfig --add innd
 su -m news -c '/usr/lib/news/bin/makedbz -i -o'
 
@@ -290,6 +293,7 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
+/sbin/ldconfig
 if [ "$1" -ge 1 ]; then
     service innd condrestart > /dev/null 2>&1
 fi
@@ -350,6 +354,9 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Thu May 14 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.4-3
+- do include libstorage.so.2 and libinnhist.so.2 into package
+
 * Mon May 11 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.4-2
 - create user/group news with reserved uidgid numbers
   (#498702)