diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 6877867..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -corosync-0.92.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77e627c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +corosync-1.1.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index f9d9b66..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: corosync -# $Id$ -NAME := corosync -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/corosync.spec b/corosync.spec index d15f780..d9394d0 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,64 +1,73 @@ +# define alphatag svn1211 + Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 0.92 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 1.1.2 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://www.openais.org Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Runtime bits +Requires: corosynclib = %{version}-%{release} Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Conflicts: openais <= 0.89, openais-devel <= 0.89 -%define ais_user_uid 39 +%define buildtrunk 0 +%{?alphatag: %define buildtrunk 1} +%{?_with_buildtrunk: %define buildtrunk 1} + +%if %{buildtrunk} +BuildRequires: autoconf automake +%endif +BuildRequires: nss-devel +BuildRequires: libibverbs-devel librdmacm-devel + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +%prep +%setup -q -n corosync-%{version} + +%if %{buildtrunk} +./autogen.sh +%endif + +export ibverbs_CFLAGS=-I/usr/include/infiniband \ +export ibverbs_LIBS=-libverbs \ +export rdmacm_CFLAGS=-I/usr/include/rdma \ +export rdmacm_LIBS=-lrdmacm \ +%{configure} \ + --enable-nss \ + --enable-rdma + +%build +make %{_smp_mflags} + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} +install -d %{buildroot}%{_initddir} +install -m 755 init/redhat %{buildroot}%{_initddir}/corosync + +## 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} %description This package contains the Corosync Cluster Engine Executive, several default APIs and libraries, default configuration files, and an init script. -%package devel -Summary: The Corosync Cluster Engine -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -This package contains include files and man pages used to develop using -The Corosync Cluster Engine APIs. - -%prep -%setup -q -n corosync-%{version} - -%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" - -%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%{_initddir} -install -m 644 LICENSE SECURITY README.devmap \ - $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -install -m 755 init/redhat $RPM_BUILD_ROOT%{_initddir}/corosync - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -# Add the "ais" user -/usr/sbin/useradd -c 'The Corosync Cluster Engine' \ - -u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || : - %post /sbin/chkconfig --add corosync || : -/sbin/ldconfig > /dev/null %preun if [ $1 -eq 0 ]; then @@ -68,19 +77,21 @@ fi %postun [ "$1" -ge "1" ] && /sbin/service corosync condrestart &>/dev/null || : -/sbin/ldconfig > /dev/null %files %defattr(-,root,root,-) -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/LICENSE -%doc %{_docdir}/%{name}-%{version}/SECURITY +%doc LICENSE SECURITY %{_sbindir}/corosync %{_sbindir}/corosync-keygen %{_sbindir}/corosync-objctl %{_sbindir}/corosync-cfgtool -%config(noreplace) /etc/corosync.conf -%config(noreplace) /etc/ld.so.conf.d/corosync-*.conf +%{_sbindir}/corosync-fplay +%{_sbindir}/corosync-pload +%{_sbindir}/corosync-cpgtool +%{_sbindir}/corosync-quorumtool +%dir %{_sysconfdir}/corosync +%dir %{_sysconfdir}/corosync/uidgid.d +%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example %{_initddir}/corosync %dir %{_libexecdir}/lcrso %{_libexecdir}/lcrso/coroparse.lcrso @@ -89,35 +100,75 @@ fi %{_libexecdir}/lcrso/service_cpg.lcrso %{_libexecdir}/lcrso/service_evs.lcrso %{_libexecdir}/lcrso/service_confdb.lcrso +%{_libexecdir}/lcrso/service_pload.lcrso +%{_libexecdir}/lcrso/quorum_votequorum.lcrso +%{_libexecdir}/lcrso/quorum_testquorum.lcrso +%{_libexecdir}/lcrso/vsf_quorum.lcrso %{_libexecdir}/lcrso/vsf_ykd.lcrso -%dir %{_libdir}/corosync -%{_libdir}/corosync/libcfg.so.* -%{_libdir}/corosync/libcpg.so.* -%{_libdir}/corosync/libconfdb.so.* -%{_libdir}/corosync/libevs.so.* -%{_libdir}/corosync/libtotem_pg.so.* -%{_libdir}/corosync/liblogsys.so.* -%{_libdir}/corosync/libcoroutil.so.* +%dir %{_localstatedir}/lib/corosync %{_mandir}/man8/corosync_overview.8* %{_mandir}/man8/corosync-objctl.8* %{_mandir}/man5/corosync.conf.5* -%files devel +%package -n corosynclib +Summary: The Corosync Cluster Engine Libraries +Group: System Environment/Libraries +Conflicts: corosync < 0.92-7 + +%description -n corosynclib +This package contains corosync libraries. + +%files -n corosynclib %defattr(-,root,root,-) -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/README.devmap +%doc LICENSE +%{_libdir}/libcfg.so.* +%{_libdir}/libcpg.so.* +%{_libdir}/libconfdb.so.* +%{_libdir}/libevs.so.* +%{_libdir}/libtotem_pg.so.* +%{_libdir}/liblogsys.so.* +%{_libdir}/libcoroipcc.so.* +%{_libdir}/libcoroipcs.so.* +%{_libdir}/libquorum.so.* +%{_libdir}/libvotequorum.so.* +%{_libdir}/libpload.so.* + +%post -n corosynclib -p /sbin/ldconfig + +%postun -n corosynclib -p /sbin/ldconfig + +%package -n corosynclib-devel +Summary: The Corosync Cluster Engine Development Kit +Group: Development/Libraries +Requires: corosynclib = %{version}-%{release} +Requires: pkgconfig +Provides: corosync-devel = %{version} +Obsoletes: corosync-devel < 0.92-7 + +%description -n corosynclib-devel +This package contains include files and man pages used to develop using +The Corosync Cluster Engine APIs. + +%files -n corosynclib-devel +%defattr(-,root,root,-) +%doc LICENSE README.devmap %dir %{_includedir}/corosync/ -%{_includedir}/corosync/saAis.h -%{_includedir}/corosync/ais_util.h +%{_includedir}/corosync/cs_config.h +%{_includedir}/corosync/corodefs.h +%{_includedir}/corosync/coroipc_types.h +%{_includedir}/corosync/coroipcs.h +%{_includedir}/corosync/coroipcc.h %{_includedir}/corosync/cfg.h %{_includedir}/corosync/confdb.h +%{_includedir}/corosync/corotypes.h %{_includedir}/corosync/cpg.h %{_includedir}/corosync/evs.h %{_includedir}/corosync/hdb.h -%{_includedir}/corosync/ipc_gen.h %{_includedir}/corosync/list.h %{_includedir}/corosync/mar_gen.h %{_includedir}/corosync/swab.h +%{_includedir}/corosync/quorum.h +%{_includedir}/corosync/votequorum.h %dir %{_includedir}/corosync/totem/ %{_includedir}/corosync/totem/coropoll.h %{_includedir}/corosync/totem/totem.h @@ -132,22 +183,171 @@ fi %{_includedir}/corosync/engine/coroapi.h %{_includedir}/corosync/engine/logsys.h %{_includedir}/corosync/engine/objdb.h -%{_libdir}/corosync/libcfg.so -%{_libdir}/corosync/libcpg.so -%{_libdir}/corosync/libconfdb.so -%{_libdir}/corosync/libevs.so -%{_libdir}/corosync/libtotem_pg.so -%{_libdir}/corosync/liblogsys.so -%{_libdir}/corosync/libcoroutil.so +%{_includedir}/corosync/engine/quorum.h +%{_libdir}/libcfg.so +%{_libdir}/libcpg.so +%{_libdir}/libconfdb.so +%{_libdir}/libevs.so +%{_libdir}/libtotem_pg.so +%{_libdir}/liblogsys.so +%{_libdir}/libcoroipcc.so +%{_libdir}/libcoroipcs.so +%{_libdir}/libquorum.so +%{_libdir}/libvotequorum.so +%{_libdir}/libpload.so +%{_libdir}/pkgconfig/*.pc %{_mandir}/man3/cpg_*3* %{_mandir}/man3/evs_*3* %{_mandir}/man3/confdb_*3* +%{_mandir}/man3/votequorum_*3* %{_mandir}/man8/cpg_overview.8* %{_mandir}/man8/evs_overview.8* %{_mandir}/man8/confdb_overview.8* %{_mandir}/man8/logsys_overview.8* +%{_mandir}/man8/votequorum_overview.8* +%{_mandir}/man8/coroipc_overview.8* %changelog +* Fri Oct 23 2009 Fabio M. Di Nitto - 1.1.2-1 +- New upstream release fixes major regression on specific loads + +* Wed Oct 21 2009 Fabio M. Di Nitto - 1.1.1-1 +- New upstream release + +* Fri Sep 25 2009 Fabio M. Di Nitto - 1.1.0-1 +- New upstream release +- spec file updates: + * enable IB support + * explicitly define built-in features at configure time + +* Tue Sep 22 2009 Fabio M. Di Nitto - 1.0.1-1 +- New upstream release +- spec file updates: + * use proper configure macro + +* Tue Jul 28 2009 Fabio M. Di Nitto - 1.0.0-3 +- spec file updates: + * more consistent use of macros across the board + * fix directory ownership + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 8 2009 Fabio M. Di Nitto - 1.0.0-1 +- New upstream release + +* Thu Jul 2 2009 Fabio M. Di Nitto - 0.100-1 +- New upstream release + +* Sat Jun 20 2009 Fabio M. Di Nitto - 0.98-1 +- New upstream release +- spec file updates: + * Drop corosync-trunk patch and alpha tag. + * Fix alphatag vs buildtrunk handling. + * Drop requirement on ais user/group and stop creating them. + * New config file locations from upstream: /etc/corosync/corosync.conf. + +* Wed Jun 10 2009 Fabio M. Di Nitto - 0.97-1.svn2233 +- spec file updates: + * Update to svn version 2233 to include library linking fixes + +* Wed Jun 10 2009 Fabio M. Di Nitto - 0.97-1.svn2232 +- New upstream release +- spec file updates: + * Drop pkgconfig fix that's now upstream + * Update to svn version 2232 + * Define buildtrunk if we are using svn snapshots + * BuildRequires: nss-devel to enable nss crypto for network communication + * Force autogen invokation if buildtrunk is defined + * Whitespace cleanup + * Stop shipping corosync.conf in favour of a generic example + * Update file list + +* Mon Mar 30 2009 Fabio M. Di Nitto - 0.95-2 +- Backport svn commit 1913 to fix pkgconfig files generation + and unbreak lvm2 build. + +* Tue Mar 24 2009 Fabio M. Di Nitto - 0.95-1 +- New upstream release +- spec file updates: + * Drop alpha tag + * Drop local patches (no longer required) + * Allow to build from svn trunk by supporting rpmbuild --with buildtrunk + * BuildRequires autoconf automake if building from trunk + * Execute autogen.sh if building from trunk and if no configure is available + * Switch to use rpm configure macro and set standard install paths + * Build invokation now supports _smp_mflags + * Remove install section for docs and use proper doc macro instead + * Add tree fixup bits to drop static libs and html docs (only for now) + * Add LICENSE file to all subpackages + * libraries have moved to libdir. Drop ld.so.conf.d corosync file + * Update BuildRoot usage to preferred versions/names + +* Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-5.svn1797 +- Update the corosync-trunk patch for real this time. + +* Tue Mar 10 2009 Fabio M. Di Nitto - 0.94-4.svn1797 +- Import fixes from upstream: + * Cleanup logsys format init around to use default settings (1795) + * logsys_format_set should use its own internal copy of format_buffer (1796) + * Add logsys_format_get to logsys API (1797) +- Cherry pick svn1807 to unbreak CPG. + +* Mon Mar 9 2009 Fabio M. Di Nitto - 0.94-3.svn1794 +- Import fixes from upstream: + * Add reserve/release feature to totem message queue space (1793) + * Fix CG shutdown (1794) + +* Fri Mar 6 2009 Fabio M. Di Nitto - 0.94-2.svn1792 +- Import fixes from upstream: + * Fix uninitialized memory. Spotted by valgrind (1788) + * Fix logsys_set_format by updating the right bits (1789) + * logsys: re-add support for timestamp (1790) + * Fix cpg crash (1791) + * Allow logsys_format_set to reset to default (1792) + +* Tue Mar 3 2009 Fabio M. Di Nitto - 0.94-1 +- New upstream release. +- Drop obsolete patches. +- Add soname bump patch that was missing from upstream. + +* Wed Feb 25 2009 Fabio M. Di Nitto - 0.93-4 +- Add Makefile fix to install all corosync tools (commit r1780) + +* Tue Feb 24 2009 Fedora Release Engineering - 0.93-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 23 2009 Fabio M. Di Nitto - 0.93-2 +- Rename gcc-4.4 patch to match svn commit (r1767). +- Backport patch from trunk (commit r1774) to fix quorum engine. + +* Thu Feb 19 2009 Fabio M. Di Nitto - 0.93-1 +- New upstream release. +- Drop alphatag from spec file. +- Drop trunk patch. +- Update Provides for corosynclib-devel. +- Backport gcc-4.4 build fix from trunk. + +* Mon Feb 2 2009 Fabio M. Di Nitto - 0.92-7.svn1756 +- Update to svn trunk at revision 1756 from upstream. +- Add support pkgconfig to devel package. +- Tidy up spec files by re-organazing sections according to packages. +- Split libraries from corosync to corosynclib. +- Rename corosync-devel to corosynclib-devel. +- Comply with multiarch requirements (libraries). + +* Tue Jan 27 2009 Fabio M. Di Nitto - 0.92-6.svn1750 +- Update to svn trunk at revision 1750 from upstream. +- Include new quorum service in the packaging. + +* Mon Dec 15 2008 Fabio M. Di Nitto - 0.92-5.svn1709 +- Update to svn trunk at revision 1709 from upstream. +- Update spec file to include new include files. + +* Wed Dec 10 2008 Fabio M. Di Nitto - 0.92-4.svn1707 +- Update to svn trunk at revision 1707 from upstream. +- Update spec file to include new lcrso services and include file. + * Mon Oct 13 2008 Dennis Gilmore - 0.92-3 - remove ExclusiveArch line diff --git a/import.log b/import.log deleted file mode 100644 index f1ab5e0..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -corosync-0_92-1_fc10:HEAD:corosync-0.92-1.fc10.src.rpm:1222323286 -corosync-0_92-2_fc10:HEAD:corosync-0.92-2.fc10.src.rpm:1222462910 diff --git a/sources b/sources index b95caa8..48ee40f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0fec3c380de83711cf3f4609d59e16e corosync-0.92.tar.gz +03ea8d775b2855fd3c0a1ed5e7705a86 corosync-1.1.2.tar.gz