SPECS: inn.spec - updated db, db4 patches to support db4.[56] - upd...

[qboosh]

Author: qboosh                       Date: Sun Feb 17 21:41:02 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated db,db4 patches to support db4.[56]
- updated ac253 patch to fix autoheader (needed to get missing define for et/com_err.h)
- added asneeded patch to workaround -as-needed issue (not fully resolved,
  there is libstorage<>libinnhist circular dependency)
- ghost soname symlinks
- fallback to creating empty history if makehistory fails
- release 0.2

---- Files affected:
SPECS:
   inn.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/inn.spec
diff -u SPECS/inn.spec:1.173 SPECS/inn.spec:1.174
--- SPECS/inn.spec:1.173	Tue Sep 11 14:30:07 2007
+++ SPECS/inn.spec	Sun Feb 17 22:40:56 2008
@@ -15,7 +15,7 @@
 Summary(tr.UTF-8):	INN, InterNet Haber Sistemi (haber sunucu)
 Name:		inn
 Version:	2.4.3
-Release:	0.1
+Release:	0.2
 License:	distributable
 Group:		Networking/Daemons
 Source0:	ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
@@ -40,13 +40,15 @@
 Patch8:		%{name}-config.patch
 Patch9:		%{name}-db4.4.patch
 Patch10:	%{name}-libdir.patch
+Patch11:	%{name}-asneeded.patch
 URL:		http://www.isc.org/sw/inn/
-BuildRequires:	fix-%post-script-first
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	db-devel
 BuildRequires:	flex
+BuildRequires:	krb5-devel
+BuildRequires:	libcom_err-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl-devel >= 1:5.8.0
@@ -261,6 +263,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 touch innfeed/*.[ly]
 
@@ -268,8 +271,9 @@
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader} -I include
 %configure \
-	CFLAGS="%{rpmcflags} -D_GNU_SOURCE" \
+	CPPFLAGS="-D_GNU_SOURCE" \
 	--with-news-user=news \
 	--with-news-group=news \
 	--with-news-master=news \
@@ -370,9 +374,8 @@
 	chmod 644 history.*
 else
 	cd /var/lib/news
-	# FIXME: this will fail immediately as it needs *configured*
-	# inn.conf, but PLD default rpm doesn't provide one!
-	%{_bindir}/makehistory
+	# makehistory fails on uninitialized spool(?) - create empty history in such case
+	%{_bindir}/makehistory || ( echo "Creating empty history instead." ; touch history )
 	%{_bindir}/makedbz -s `wc -l <history` -f history
 	for i in dir hash index pag; do
 		[ -f history.n.$i ] && mv history.n.$i history.$i
@@ -611,18 +614,29 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libinn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libinn.so.2
+%attr(755,root,root) %{_libdir}/libinnhist.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libinnhist.so.2
+%attr(755,root,root) %{_libdir}/libstorage.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstorage.so.2
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libinn.so
+%attr(755,root,root) %{_libdir}/libinnhist.so
+%attr(755,root,root) %{_libdir}/libstorage.so
+%{_libdir}/libinn.la
+%{_libdir}/libinnhist.la
+%{_libdir}/libstorage.la
 %{_includedir}
-%{_libdir}/lib*.la
-%{_libdir}/lib*.so
 %{_mandir}/man3/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libinn.a
+%{_libdir}/libinnhist.a
+%{_libdir}/libstorage.a
 
 %files -n inews
 %defattr(644,root,root,755)
@@ -635,6 +649,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2008-02-17 21:40:56  qboosh
+- updated db,db4 patches to support db4.[56]
+- updated ac253 patch to fix autoheader (needed to get missing define for et/com_err.h)
+- added asneeded patch to workaround -as-needed issue (not fully resolved,
+  there is libstorage<>libinnhist circular dependency)
+- ghost soname symlinks
+- fallback to creating empty history if makehistory fails
+- release 0.2
+
 Revision 1.173  2007-09-11 12:30:07  gotar
 - oops, it's 3.7-4 not 3.7.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/inn.spec?r1=1.173&r2=1.174&f=u