From 7303bfe4668692aaeae6df8cfca838f47e067902 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Wed, 1 Feb 2012 06:14:45 +0100 Subject: [PATCH] New upstream release Signed-off-by: Fabio M. Di Nitto --- .gitignore | 1 + corosync.spec | 122 +++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 78 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index ea43b1d..3903a41 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ corosync-1.2.7.tar.gz /corosync-1.4.0.tar.gz /corosync-1.4.1.tar.gz /corosync-1.4.2.tar.gz +/corosync-1.99.1.tar.gz diff --git a/corosync.spec b/corosync.spec index 2f37e75..e70d9a6 100644 --- a/corosync.spec +++ b/corosync.spec @@ -10,11 +10,14 @@ %ifnarch s390 s390x %bcond_without rdma %endif +%bcond_without systemd +%bcond_without nss +%bcond_with xmlconf Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 1.4.2 -Release: 2%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 1.99.1 +Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: BSD Group: System Environment/Base URL: http://ftp.corosync.org @@ -25,17 +28,20 @@ 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 +Conflicts: openais, openais-devel # Build bits %define buildtrunk 0 %{?_with_buildtrunk: %define buildtrunk 1} +BuildRequires: libqb-devel >= 0.9.0 %if %{buildtrunk} BuildRequires: autoconf automake %endif +%if %{with nss} BuildRequires: nss-devel +%endif %if %{with rdma} BuildRequires: libibverbs-devel librdmacm-devel %endif @@ -45,6 +51,12 @@ BuildRequires: net-snmp-devel %if %{with dbus} BuildRequires: dbus-devel %endif +%if %{with systemd} +BuildRequires: systemd-units +%endif +%if %{with xmlconf} +Requires: libxslt +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -63,7 +75,11 @@ export rdmacm_CFLAGS=-I/usr/include/rdma \ export rdmacm_LIBS=-lrdmacm \ %endif %{configure} \ +%if %{with nss} --enable-nss \ +%else + --disable-nss \ +%endif %if %{with testagents} --enable-testagents \ %endif @@ -81,6 +97,12 @@ export rdmacm_LIBS=-lrdmacm \ %endif %if %{with rdma} --enable-rdma \ +%endif +%if %{with systemd} + --enable-systemd \ +%endif +%if %{with xmlconf} + --enable-xmlconf \ %endif --with-initddir=%{_initrddir} @@ -123,18 +145,20 @@ fi %files %defattr(-,root,root,-) %doc LICENSE SECURITY -%{_bindir}/corosync-blackbox %{_sbindir}/corosync %{_sbindir}/corosync-keygen -%{_sbindir}/corosync-objctl +%{_sbindir}/corosync-cmapctl %{_sbindir}/corosync-cfgtool %{_sbindir}/corosync-fplay %{_sbindir}/corosync-pload %{_sbindir}/corosync-cpgtool %{_sbindir}/corosync-quorumtool %{_sbindir}/corosync-notifyd +%{_bindir}/corosync-blackbox +%if %{with xmlconf} +%{_bindir}/corosync-xmlproc +%endif %dir %{_sysconfdir}/corosync -%dir %{_sysconfdir}/corosync/service.d %dir %{_sysconfdir}/corosync/uidgid.d %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu @@ -144,27 +168,19 @@ fi %if %{with snmp} %{_datadir}/snmp/mibs/COROSYNC-MIB.txt %endif +%if %{with systemd} +%{_unitdir}/corosync.service +%{_unitdir}/corosync-notifyd.service +%else %{_initrddir}/corosync %{_initrddir}/corosync-notifyd -%dir %{_libexecdir}/lcrso -%{_libexecdir}/lcrso/coroparse.lcrso -%{_libexecdir}/lcrso/objdb.lcrso -%{_libexecdir}/lcrso/service_cfg.lcrso -%{_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 +%endif %dir %{_localstatedir}/lib/corosync -%attr(700, root, root) %{_localstatedir}/log/cluster %dir %{_localstatedir}/log/cluster %{_mandir}/man8/corosync_overview.8* %{_mandir}/man8/corosync.8* %{_mandir}/man8/corosync-blackbox.8* -%{_mandir}/man8/corosync-objctl.8* +%{_mandir}/man8/corosync-cmapctl.8* %{_mandir}/man8/corosync-keygen.8* %{_mandir}/man8/corosync-cfgtool.8* %{_mandir}/man8/corosync-cpgtool.8* @@ -173,7 +189,35 @@ fi %{_mandir}/man8/corosync-notifyd.8* %{_mandir}/man8/corosync-quorumtool.8* %{_mandir}/man5/corosync.conf.5* +%{_mandir}/man5/votequorum.5* +# optional testagent rpm +# +%if %{with testagents} + +%package -n corosync-testagents +Summary: The Corosync Cluster Engine Test Agents +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libqb >= 0.9.0 + +%description -n corosync-testagents +This package contains corosync test agents. + +%files -n corosync-testagents +%defattr(755,root,root,-) +%{_datadir}/corosync/tests/mem_leak_test.sh +%{_datadir}/corosync/tests/net_breaker.sh +%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh +%{_datadir}/corosync/tests/shm_leak_audit.sh +%{_bindir}/cpg_test_agent +%{_bindir}/sam_test_agent +%{_bindir}/votequorum_test_agent + +%endif + +# library +# %package -n corosynclib Summary: The Corosync Cluster Engine Libraries Group: System Environment/Libraries @@ -187,12 +231,9 @@ This package contains corosync libraries. %doc LICENSE %{_libdir}/libcfg.so.* %{_libdir}/libcpg.so.* -%{_libdir}/libconfdb.so.* +%{_libdir}/libcmap.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.* @@ -216,15 +257,12 @@ The Corosync Cluster Engine APIs. %files -n corosynclib-devel %defattr(-,root,root,-) -%doc LICENSE README.devmap +%doc LICENSE %dir %{_includedir}/corosync/ %{_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/cmap.h %{_includedir}/corosync/corotypes.h %{_includedir}/corosync/cpg.h %{_includedir}/corosync/evs.h @@ -236,28 +274,16 @@ The Corosync Cluster Engine APIs. %{_includedir}/corosync/quorum.h %{_includedir}/corosync/votequorum.h %dir %{_includedir}/corosync/totem/ -%{_includedir}/corosync/totem/coropoll.h %{_includedir}/corosync/totem/totem.h %{_includedir}/corosync/totem/totemip.h %{_includedir}/corosync/totem/totempg.h -%dir %{_includedir}/corosync/lcr/ -%{_includedir}/corosync/lcr/lcr_ckpt.h -%{_includedir}/corosync/lcr/lcr_comp.h -%{_includedir}/corosync/lcr/lcr_ifact.h %dir %{_includedir}/corosync/engine -%{_includedir}/corosync/engine/config.h -%{_includedir}/corosync/engine/coroapi.h -%{_includedir}/corosync/engine/logsys.h -%{_includedir}/corosync/engine/objdb.h %{_includedir}/corosync/engine/quorum.h %{_libdir}/libcfg.so %{_libdir}/libcpg.so -%{_libdir}/libconfdb.so +%{_libdir}/libcmap.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 @@ -265,18 +291,22 @@ The Corosync Cluster Engine APIs. %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/cpg_*3* %{_mandir}/man3/evs_*3* -%{_mandir}/man3/confdb_*3* +%{_mandir}/man3/quorum_*3* %{_mandir}/man3/votequorum_*3* %{_mandir}/man3/sam_*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* %{_mandir}/man8/sam_overview.8* %changelog +* Wed Feb 1 2012 Fabio M. Di Nitto - 1.99.1-1 +- New upstream release +- Temporary disable xml config (broken upstream tarball) + +* Wed Jan 24 2012 Jan Friesse - 1.99.0-1 +- New upstream release + * Thu Jan 12 2012 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index bd01b5d..65759d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -061ee5522097fee69475b38a66bf1d6a corosync-1.4.2.tar.gz +d4bfd60d967cfa05a12d369c446aa415 corosync-1.99.1.tar.gz