rpms/openais/F-10 openais.spec,1.30,1.31 sources,1.11,1.12

Fri Jul 31 08:22:29 UTC 2009

Author: fabbione

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

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-10/openais.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31

--- openais.spec	14 Oct 2008 03:55:11 -0000	1.30
+++ openais.spec	31 Jul 2009 08:22:28 -0000	1.31
@@ -1,55 +1,73 @@
+# define alphatag 0
+
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.91
-Release: 2%{?dist}
+Version: 1.0.0
+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
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Runtime bits
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires: corosync
-BuildRequires: corosync-devel
+Requires: corosync >= 1.0.0-1
+Requires: openaislib = %{version}-%{release}
 Conflicts: openais-devel <= 0.89
 
-%description 
-This package contains the openais service handlers, default configuration
-files, programming libraries, and init script.
+# Setup/build bits
+BuildRequires: corosynclib-devel >= 1.0.0-1
 
-%package devel
-Summary: The openais Standards-Based Cluster Framework libraries
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+%define buildtrunk 0
+%{?alphatag: %define buildtrunk 1}
+%{?_with_buildtrunk: %define buildtrunk 1}
+
+%if %{buildtrunk}
+BuildRequires: autoconf automake
+%endif
 
-%description devel
-This package contains the include files used to develop using openais APIs.
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %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 $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT STATICLIBS=NO
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 644 LICENSE README.amf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-install -m 755 init/redhat $RPM_BUILD_ROOT%{_initrddir}/openais
+rm -rf %{buildroot}
+
+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 $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%description 
+This package contains the openais service handlers, default configuration
+files and init script.
 
 %post
 /sbin/chkconfig --add openais || :
-/sbin/ldconfig > /dev/null
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -59,20 +77,14 @@ fi
 
 %postun
 [ "$1" -ge "1" ] && %{_initrddir}/openais condrestart &>/dev/null || :
-/sbin/ldconfig > /dev/null
 
 %files 
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/README.amf
-%dir /etc/ais
-%config(noreplace) /etc/ais/openais.conf
-%config(noreplace) /etc/ais/amf.conf
-%config(noreplace) /etc/ld.so.conf.d/openais-*.conf
+%doc LICENSE README.amf
+%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
@@ -80,22 +92,50 @@ fi
 %{_libexecdir}/lcrso/service_evt.lcrso
 %{_libexecdir}/lcrso/service_lck.lcrso
 %{_libexecdir}/lcrso/service_msg.lcrso
+%{_libexecdir}/lcrso/service_tmr.lcrso
 %{_mandir}/man8/openais_overview.8*
 %{_mandir}/man5/openais.conf.5*
 %{_mandir}/man5/amf.conf.5*
-%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.*
 %{_sbindir}/aisexec
 %{_sbindir}/openais-instantiate
 
-%files devel
+%package -n openaislib
+Summary: The openais Standards-Based Cluster Framework libraries
+Group: System Environment/Libraries
+Conflicts: openais < 0.91-6
+
+%description -n openaislib
+This package contains openais libraries. 
+
+%files -n openaislib
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
+%doc LICENSE
+%{_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
+
+%postun -n openaislib -p /sbin/ldconfig
+
+%package -n openaislib-devel
+Summary: The openais Standards-Based Cluster Framework libraries
+Group: Development/Libraries
+Requires: openaislib = %{version}-%{release}
+Requires: pkgconfig
+Provides: openais-devel = %{version}
+Obsoletes: openais-devel < 0.91-6
+
+%description -n openaislib-devel
+This package contains the include files used to develop using openais APIs.
+
+%files -n openaislib-devel
+%defattr(-,root,root,-)
+%doc LICENSE
 %dir %{_includedir}/openais/
 %{_includedir}/openais/saAis.h
 %{_includedir}/openais/saAmf.h
@@ -104,14 +144,103 @@ fi
 %{_includedir}/openais/saEvt.h
 %{_includedir}/openais/saLck.h
 %{_includedir}/openais/saMsg.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
+%{_includedir}/openais/saTmr.h
+%{_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:
+  * Drop alpha tag
+  * Drop local patches (no longer required)
+  * Remove install section for docs and use proper doc macro instead
+  * Add LICENSE file to all subpackages
+  * Bump Requires and BuildRequires to corosync 0.95-1
+  * openaislib-devel now Requires pkgconfig
+  * Update BuildRoot usage to preferred versions/names
+
+* Mon Mar  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-2.svn1741
+- Import fixes from upstream:
+  * Updates for new totem interface (1737, 1738, 1739, 1741).
+  * Fix ipc connection (1740).
+
+* Tue Mar  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-1
+- New upstream release.
+- Bump Requires and BuildRequires to corosync 0.94-1.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.92-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.92-2
+- Rename SaTmr patch to match svn commit (r1717).
+
+* Thu Feb 19 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.92-1
+- New upstream release.
+- Drop alphatag from spec file.
+- Drop trunk patch.
+- Update Provides for corosynclib-devel.
+- Update BuildRequires and Requires for new corosync.
+- Add libSaTmr to packaging.
+- Backport pkgconfig support for libSaTmr from trunk.
+
+* Mon Feb  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-6.svn1688
+- Update to svn trunk at revision 1688 from upstream.
+- Add support pkgconfig to devel package.
+- Update BuildRequires: on corosynclib-devel.
+- Tidy up spec files by re-organazing sections according to packages.
+- Split libraries from openais to openaislib.
+- Rename openais-devel to openaislib-devel.
+- Comply with multiarch requirements (libraries).
+
+* Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-5.svn1682
+- Update to svn trunk at revision 1682 from upstream.
+
+* Mon Dec 15 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-4.svn1667
+- No change rebuild against newer corosync.
+
+* Wed Dec 10 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-3.svn1667
+- Update to svn trunk at revision 1667 from upstream.
+- Update spec file to support alpha tag versioning.
+- Tight dependencies (both build and runtime) with corosync to avoid
+  internal ABI issues.
+
 * Mon Oct 13 2008 Dennis Gilmore <dennis at ausil.us> 0.91-2
 - remove ExclusiveArch line
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Sep 2008 08:07:36 -0000	1.11
+++ sources	31 Jul 2009 08:22:29 -0000	1.12
@@ -1 +1 @@
-b88301b21b4cb59765cb872c231128fb  openais-0.91.tar.gz
+33c22a0da30a5a4dd091375839edbf07  openais-1.0.0.tar.gz


