packages: openais/openais.spec - ac version - verbose pkgconfig files - pro...

[qboosh]

Author: qboosh                       Date: Sun Sep 19 08:46:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ac version
- verbose pkgconfig files
- proper init.d path
- package openais.conf(5) man, corosync note is not true (any longer?)
- kill OPT_CFLAGS override to -O3

---- Files affected:
packages/openais:
   openais.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/openais/openais.spec
diff -u packages/openais/openais.spec:1.20 packages/openais/openais.spec:1.21
--- packages/openais/openais.spec:1.20	Tue Sep  7 11:10:38 2010
+++ packages/openais/openais.spec	Sun Sep 19 10:45:57 2010
@@ -9,11 +9,12 @@
 Source0:	ftp://ftp:download@ftp.openais.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	e500ad3c49fdc45d8653f864e80ed82c
 URL:		http://www.openais.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
 BuildRequires:	corosync-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -22,7 +23,6 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	/sbin/chkconfig
 Requires:	corosync
 Provides:	group(ais)
 Provides:	user(ais)
@@ -77,12 +77,15 @@
 %prep
 %setup -q
 
+sed -i -e 's/OPT_CFLAGS=.*/OPT_CFLAGS=/' configure.ac
+
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 
 %configure \
+	--with-initddir=/etc/rc.d/init.d \
 	--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir)
 
 %{__make}
@@ -94,12 +97,10 @@
 
 # Install the config and comment out all examples
 mv $RPM_BUILD_ROOT/etc/corosync/amf.conf{.example,}
-sed -i -e 's/\(^.*$\)/#\1/' $RPM_BUILD_ROOT/etc/corosync/amf.conf
+sed -i -e 's/^/#/' $RPM_BUILD_ROOT/etc/corosync/amf.conf
 
 # Cleanup the buildroot
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/openais/
-# remove openais.conf now it is corosync.conf from corosync package
-rm -f $RPM_BUILD_ROOT/usr/share/man/man5/man5/openais.conf.5*
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/openais
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,11 +134,11 @@
 %attr(755,root,root) %{_sbindir}/aisexec
 %attr(755,root,root) %{_sbindir}/openais-instantiate
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/corosync/amf.conf
-%attr(754,root,root) /etc/init.d/openais
-%attr(755,root,root) %{_libdir}/lcrso/*.lcrso
+%attr(754,root,root) /etc/rc.d/init.d/openais
+%attr(755,root,root) %{_libdir}/lcrso/openaisserviceenable.lcrso
+%attr(755,root,root) %{_libdir}/lcrso/service_*.lcrso
 %{_mandir}/man5/amf.conf.5*
-# do not package openais.conf - now it is corosync.conf from corosync package
-#%%{_mandir}/man5/openais.conf.5*
+%{_mandir}/man5/openais.conf.5*
 %{_mandir}/man8/openais_overview.8*
 
 %files libs
@@ -167,7 +168,13 @@
 %attr(755,root,root) %{_libdir}/libSaMsg.so
 %attr(755,root,root) %{_libdir}/libSaTmr.so
 %{_includedir}/openais
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libSaAmf.pc
+%{_pkgconfigdir}/libSaCkpt.pc
+%{_pkgconfigdir}/libSaClm.pc
+%{_pkgconfigdir}/libSaEvt.pc
+%{_pkgconfigdir}/libSaLck.pc
+%{_pkgconfigdir}/libSaMsg.pc
+%{_pkgconfigdir}/libSaTmr.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -185,6 +192,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2010/09/19 08:45:57  qboosh
+- ac version
+- verbose pkgconfig files
+- proper init.d path
+- package openais.conf(5) man, corosync note is not true (any longer?)
+- kill OPT_CFLAGS override to -O3
+
 Revision 1.20  2010/09/07 09:10:38  alucard
 - up to 1.1.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openais/openais.spec?r1=1.20&r2=1.21&f=u