rpms/openais/F-11 openais.spec,1.42,1.43 sources,1.14,1.15

Tue Jul 28 12:46:36 UTC 2009

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22444

Modified Files:
	openais.spec sources 
Log Message:
New upstream stable release fixes several major bugs



Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/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	28 Jul 2009 12:46:35 -0000	1.43
@@ -1,8 +1,8 @@
-## define alphatag svn1741
+# define alphatag 0
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.94
+Version: 1.0.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -12,30 +12,53 @@ Source0: http://www.osdl.org/downloads/o
 # Runtime bits
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires: corosync >= 0.95-1
+Requires: corosync >= 1.0.0-1
 Requires: openaislib = %{version}-%{release}
 Conflicts: openais-devel <= 0.89
 
 # Setup/build bits
+BuildRequires: corosynclib-devel >= 1.0.0-1
+
+%define buildtrunk 0
+%{?alphatag: %define buildtrunk 1}
+%{?_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}
 
+%if %{buildtrunk}
+./autogen.sh
+%endif
+
+%{_configure}	CFLAGS="$(echo '%{optflags}')" \
+		--prefix=%{_prefix} \
+		--sysconfdir=%{_sysconfdir} \
+		--localstatedir=%{_localstatedir} \
+		--libdir=%{_libdir} \
+		--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir)
+
 %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}
 
@@ -58,12 +81,10 @@ fi
 %files 
 %defattr(-,root,root,-)
 %doc LICENSE README.amf
-%dir /etc/ais
-%config(noreplace) /etc/ais/openais.conf
-%config(noreplace) /etc/ais/amf.conf
+%dir %{_sysconfdir}/corosync
+%config(noreplace) %{_sysconfdir}/corosync/amf.conf.example
 %{_initrddir}/openais
 %dir %{_libexecdir}/lcrso
-%{_libexecdir}/lcrso/openaisparser.lcrso
 %{_libexecdir}/lcrso/openaisserviceenable.lcrso
 %{_libexecdir}/lcrso/service_amf.lcrso
 %{_libexecdir}/lcrso/service_ckpt.lcrso
@@ -89,15 +110,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 +145,46 @@ 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
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+- spec file updates:
+  * consistent use of macros across the board
+
+* Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
+- New upstream release
+
+* Sat Jun 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.97-1
+- New upstream release
+- spec file updates:
+  * Drop openais-trunk patch and alpha tag.
+  * Fix alphatag vs buildtrunk handling.
+  * New config file locations from upstream: /etc/corosync/.
+  * Fix configure invokation.
+  * Requires and BuildRequires corosync 0.98
+
+* 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/F-11/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	28 Jul 2009 12:46:35 -0000	1.15
@@ -1 +1 @@
-f3cffde3a4bdf1b23122d10825b501d1  openais-0.94.tar.gz
+33c22a0da30a5a4dd091375839edbf07  openais-1.0.0.tar.gz


