rpms/openais/devel .cvsignore, 1.13, 1.14 openais.spec, 1.42, 1.43 sources, 1.14, 1.15

Wed Jun 10 07:23:05 UTC 2009

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11202

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
Update to openais 0.96 + svn 1951



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14

--- .cvsignore	24 Mar 2009 08:30:17 -0000	1.13
+++ .cvsignore	10 Jun 2009 07:22:34 -0000	1.14
@@ -1 +1,2 @@
-openais-0.94.tar.gz
+openais-0.96.tar.gz
+openais-trunk.diff


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- openais.spec	24 Mar 2009 08:30:17 -0000	1.42
+++ openais.spec	10 Jun 2009 07:22:34 -0000	1.43
@@ -1,41 +1,69 @@
-## define alphatag svn1741
+%define alphatag svn1951
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.94
+Version: 0.96
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
+Patch0: openais-trunk.diff
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires: corosync >= 0.95-1
+Requires: corosync >= 0.97-1.svn2226
 Requires: openaislib = %{version}-%{release}
 Conflicts: openais-devel <= 0.89
 
 # Setup/build bits
+BuildRequires: corosynclib-devel >= 0.97-1.svn2226
+
+%if %{alphatag}
+%define buildtrunk 1
+%else
+%define buildtrunk 0
+%endif
+%{?_with_buildtrunk: %define buildtrunk 1}
+
+%if %{buildtrunk}
+BuildRequires: autoconf automake
+%endif
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: corosynclib-devel >= 0.95-1
 
 %prep
 %setup -q -n openais-%{version}
+%patch0 -p0
+
+%if %{buildtrunk}
+./autogen.sh
+%endif
+
+%{_configure}	CFLAGS="$(echo '%{optflags}')" \
+		--prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc/ais \
+		--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir) \
+		--libdir=%{_libdir}
 
 %build
-# -O3 required for performance reasons
-# So we get proper debug output, for now we don't compile with O3
-#CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3"
-CFLAGS="$(echo '%{optflags}')"
-make CFLAGS="$CFLAGS"
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} STATICLIBS=NO
+
+make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_initrddir}
 install -m 755 init/redhat %{buildroot}%{_initrddir}/openais
 
+## tree fixup
+# drop static libs
+rm -f %{buildroot}%{_libdir}/*.a
+# drop docs and html docs for now
+rm -rf %{buildroot}%{_docdir}/*
+
 %clean
 rm -rf %{buildroot}
 
@@ -59,8 +87,8 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
 %dir /etc/ais
-%config(noreplace) /etc/ais/openais.conf
-%config(noreplace) /etc/ais/amf.conf
+%config(noreplace) /etc/ais/openais.conf.example
+%config(noreplace) /etc/ais/amf.conf.example
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/openaisparser.lcrso
@@ -89,15 +117,13 @@ This package contains openais libraries.
 %files -n openaislib
 %defattr(-,root,root,-)
 %doc LICENSE
-%config(noreplace) /etc/ld.so.conf.d/openais-*.conf
-%dir %{_libdir}/openais
-%{_libdir}/openais/libSaAmf.so.*
-%{_libdir}/openais/libSaCkpt.so.*
-%{_libdir}/openais/libSaClm.so.*
-%{_libdir}/openais/libSaEvt.so.*
-%{_libdir}/openais/libSaLck.so.*
-%{_libdir}/openais/libSaMsg.so.*
-%{_libdir}/openais/libSaTmr.so.*
+%{_libdir}/libSaAmf.so.*
+%{_libdir}/libSaCkpt.so.*
+%{_libdir}/libSaClm.so.*
+%{_libdir}/libSaEvt.so.*
+%{_libdir}/libSaLck.so.*
+%{_libdir}/libSaMsg.so.*
+%{_libdir}/libSaTmr.so.*
 
 %post -n openaislib -p /sbin/ldconfig
 
@@ -126,16 +152,29 @@ This package contains the include files 
 %{_includedir}/openais/saLck.h
 %{_includedir}/openais/saMsg.h
 %{_includedir}/openais/saTmr.h
-%{_libdir}/openais/libSaAmf.so
-%{_libdir}/openais/libSaCkpt.so
-%{_libdir}/openais/libSaClm.so
-%{_libdir}/openais/libSaEvt.so
-%{_libdir}/openais/libSaLck.so
-%{_libdir}/openais/libSaMsg.so
-%{_libdir}/openais/libSaTmr.so
+%{_libdir}/libSaAmf.so
+%{_libdir}/libSaCkpt.so
+%{_libdir}/libSaClm.so
+%{_libdir}/libSaEvt.so
+%{_libdir}/libSaLck.so
+%{_libdir}/libSaMsg.so
+%{_libdir}/libSaTmr.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.96-1.svn1951
+- New upstream release
+- spec file updates:
+  * Update to svn version 1951.
+  * Define buildtrunk if we are using svn snapshots
+  * Bump Requires and BuildRequires to corosync 0.97-1.svn2226
+  * Force autogen invokation if buildtrunk is defined
+  * Whitespace cleanup
+  * Respect _smp_mflags and update configure invokation
+  * Update tree cleanup section
+  * Stop shipping openais.conf and amf.conf in favour of generic examples
+  * libraries have moved to libdir. Drop ld.so.conf.d openais file
+
 * Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.94-1
 - New upstream release
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Mar 2009 08:30:17 -0000	1.14
+++ sources	10 Jun 2009 07:22:34 -0000	1.15
@@ -1 +1,2 @@
-f3cffde3a4bdf1b23122d10825b501d1  openais-0.94.tar.gz
+930f87b7aff22c2dc7de38c82bd07caa  openais-0.96.tar.gz
+e39e75df93275f596b3689032c92b4ed  openais-trunk.diff


