pool/corosync
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 184074 from home:lisaseraph:branches:network:ha-clustering:Factory

Browse Source 
update corosync to version 2.3.1

OBS-URL: https://build.opensuse.org/request/show/184074
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=25
This commit is contained in:
Lidong Zhong 2013-07-24 02:04:48 +00:00 committed by Git OBS Bridge
parent ec6411e488
commit 32c4a97e60
4 changed files with 181 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
corosync-1.4.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9dbe9f84b397108c9a63bc4ee48c61631cbfec7b28930c6edff720429ac364a
size 803598

3
corosync-2.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf02dea11b86706128dd2f3f7d92724a263d099083fbb844492d30f2034a5d2d
size 964094

5
corosync.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 23 09:44:07 UTC 2013 - xli@suse.com
- Update to corosync 2.3.1 stable release
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 10 13:18:25 UTC 2013 - tserong@suse.com Fri May 10 13:18:25 UTC 2013 - tserong@suse.com

290
corosync.spec
View File

@ -16,6 +16,19 @@
# #
# Conditionals
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
# to disable or enable specific features
%bcond_with testagents
%bcond_with watchdog
%bcond_with monitoring
%bcond_with snmp
%bcond_with rdma
%bcond_with systemd
%bcond_with upstart
%bcond_with xmlconf
%bcond_with runautogen
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
%ifnarch s390 s390x %ifnarch s390 s390x
%define buildib 1 %define buildib 1
@ -29,63 +42,101 @@ Name: corosync
Summary: The Corosync Cluster Engine and Application Programming Interfaces Summary: The Corosync Cluster Engine and Application Programming Interfaces
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Version: 1.4.5 Version: 2.3.1
Release: 0 Release: 0
Url: http://www.corosync.org Url: http://www.corosync.org
Source0: http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz Source0: http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz
Source2: baselibs.conf Source2: baselibs.conf
Patch1: corosync-confexample-timestamp.patch #Patch1: corosync-confexample-timestamp.patch
Patch2: corosync-revert-cs2429.patch #Patch2: corosync-revert-cs2429.patch
Patch4: corosync.conf.example.patch #Patch4: corosync.conf.example.patch
Patch5: corosync-cpg-procdown.patch #Patch5: corosync-cpg-procdown.patch
Patch6: corosync_reduce_RR_priority.patch #Patch6: corosync_reduce_RR_priority.patch
Patch7: fix-nodeid-conflicting.patch #Patch7: fix-nodeid-conflicting.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Runtime bits # Runtime bits
Requires: libcorosync4 = %{version}-%{release} Requires: libcorosync4 = %{version}-%{release}
Requires(pre): /usr/sbin/useradd #Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig #Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig #Requires(preun): /sbin/chkconfig
Conflicts: openais <= 0.89, libopenais2 <= 0.89, libopenais-devel <= 0.89 #Conflicts: openais <= 0.89, openais-devel <= 0.89
%define buildtrunk 1
%{?_with_buildtrunk: %define buildtrunk 1} BuildRequires: libqb-devel
%if 0%{?buildtrunk} == 1
BuildRequires: autoconf
BuildRequires: automake
%endif
BuildRequires: mozilla-nss BuildRequires: mozilla-nss
BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-devel
%if 0%{?buildib} == 1 %if %{with runautogen}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%endif
%if %{with monitoring}
BuildRequires: libstatgrab-devel
%endif
%if %{with rdma}
BuildRequires: libibverbs-devel BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel BuildRequires: librdmacm-devel
%endif %endif
BuildRequires: pkg-config %if %{with snmp}
BuildRequires: net-snmp-devel
%endif
#%if %{with systemd}
#BuildRequires: systemd-devel
BuildRequires: systemd
#Requires(post): systemd
#Requires(preun): systemd
#Requires(postun): systemd
#%endif
%if %{with xmlconf}
Requires: libxslt
%endif
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 #%patch1 -p1
%patch2 -p1 #%patch2 -p1
%patch4 -p1 #%patch4 -p1
%patch5 -p1 #%patch5 -p1
%patch6 -p1 #%patch6 -p1
%patch7 -p1 #%patch7 -p1
%build %build
%if 0%{?buildtrunk} == 1 %if 0%{?buildtrunk} == 1
./autogen.sh ./autogen.sh
%endif %endif
%if 0%{?buildib} == 1
%if %{with rdma}
export ibverbs_CFLAGS=-I/usr/include/infiniband \ export ibverbs_CFLAGS=-I/usr/include/infiniband \
export ibverbs_LIBS=-libverbs \ export ibverbs_LIBS=-libverbs \
export rdmacm_CFLAGS=-I/usr/include/rdma \ export rdmacm_CFLAGS=-I/usr/include/rdma \
export rdmacm_LIBS=-lrdmacm \ export rdmacm_LIBS=-lrdmacm \
%{configure} \
--enable-nss \
--enable-rdma
%else
%{configure} \
--enable-nss
%endif %endif
%{configure} \
%if %{with testagents}
--enable-testagents \
%endif
%if %{with watchdog}
--enable-watchdog \
%endif
%if %{with monitoring}
--enable-monitoring \
%endif
%if %{with snmp}
--enable-snmp \
%endif
%if %{with rdma}
--enable-rdma \
%endif
%if %{with upstart}
--enable-upstart \
%endif
%if %{with xmlconf}
--enable-xmlconf \
%endif
--with-initddir=%{_initrddir} \
--with-systemddir=%{_unitdir} \
--with-upstartdir=%{_sysconfdir}/init \
--enable-systemd
make %{_smp_mflags} make %{_smp_mflags}
%install %install
@ -95,18 +146,27 @@ make install DESTDIR=%{buildroot}
#%if 0%{?suse_version} #%if 0%{?suse_version}
#ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync #ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync
#%endif #%endif
rm -f %{buildroot}%{_initrddir}/corosync #rm -f %{buildroot}%{_initrddir}/corosync
rm -f %{buildroot}%{_initrddir}/corosync-notifyd #rm -f %{buildroot}%{_initrddir}/corosync-notifyd
rm -f %{buildroot}/usr/sbin/corosync-notifyd #rm -f %{buildroot}/usr/sbin/corosync-notifyd
rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8 #rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
## tree fixup ## tree fixup
# drop static libs # drop static libs
rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/*.la
# drop docs and html docs for now # drop docs and html docs for now
rm -rf %{buildroot}%{_docdir}/* rm -rf %{buildroot}%{_docdir}/*
# the docdir is /usr/share/doc/<pkg> in the configuration
rm -rf %{buildroot}%{_datadir}/doc/* rm -rf %{buildroot}%{_datadir}/doc/*
# /etc/sysconfig/corosync-notifyd
#mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
#install -m 644 tools/corosync-notifyd.sysconfig.example \
# %{buildroot}%{_sysconfdir}/sysconfig/corosync-notifyd
#%{__install} -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/
#%{__install} -m 0644 %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
install -m 0644 tools/corosync-notifyd.sysconfig.example %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -115,78 +175,106 @@ This package contains the Corosync Cluster Engine Executive, several
default APIs and libraries, default configuration files, and an init default APIs and libraries, default configuration files, and an init
script. script.
%pre
#%if %{with systemd} && 0%{?systemd_post:1}
%service_add_pre corosync.service corosync-notifyd.service
%post
#%if %{with systemd} && 0%{?systemd_post:1}
#%systemd_post corosync.service corosync-notifyd.service
%service_add_post corosync.service corosync-notifyd.service
#%else
#if [ $1 -eq 1 ]; then
# /sbin/chkconfig --add corosync || :
#fi
#%endif
%preun
#%if %{with systemd} && 0%{?systemd_preun:1}
#%systemd_preun corosync.service corosync-notifyd.service
%service_del_preun corosync.service corosync-notifyd.service
#%else
#if [ $1 -eq 0 ]; then
# /sbin/service corosync stop &>/dev/null || :
# /sbin/chkconfig --del corosync || :
#fi
#%endif
%postun
#%if %{with systemd} && 0%{?systemd_postun:1}
#%systemd_postun corosync.service corosync-notifyd.service
%service_del_postun corosync.service corosync-notifyd.service
#%endif
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE SECURITY %doc LICENSE SECURITY
%{_bindir}/corosync-blackbox
%{_sbindir}/corosync %{_sbindir}/corosync
%{_sbindir}/corosync-keygen %{_sbindir}/corosync-keygen
%{_sbindir}/corosync-objctl %{_sbindir}/corosync-cmapctl
%{_sbindir}/corosync-cfgtool %{_sbindir}/corosync-cfgtool
%{_sbindir}/corosync-fplay
%{_sbindir}/corosync-pload
%{_sbindir}/corosync-cpgtool %{_sbindir}/corosync-cpgtool
%{_sbindir}/corosync-quorumtool %{_sbindir}/corosync-quorumtool
%{_sbindir}/corosync-notifyd
%{_bindir}/corosync-blackbox
%if %{with xmlconf}
%{_bindir}/corosync-xmlproc
%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
%dir %{_datadir}/corosync
%{_datadir}/corosync/xml2conf.xsl
%{_mandir}/man8/corosync-xmlproc.8*
%{_mandir}/man5/corosync.xml.5*
%endif
%dir %{_sysconfdir}/corosync %dir %{_sysconfdir}/corosync
%dir %{_sysconfdir}/corosync/service.d
%dir %{_sysconfdir}/corosync/uidgid.d %dir %{_sysconfdir}/corosync/uidgid.d
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
%dir %{_libexecdir}/lcrso #%config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd
%{_libexecdir}/lcrso/coroparse.lcrso %config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
%{_libexecdir}/lcrso/objdb.lcrso %if %{with snmp}
%{_libexecdir}/lcrso/service_cfg.lcrso %{_datadir}/snmp/mibs/COROSYNC-MIB.txt
%{_libexecdir}/lcrso/service_cpg.lcrso %endif
%{_libexecdir}/lcrso/service_evs.lcrso #%if %{with systemd}
%{_libexecdir}/lcrso/service_confdb.lcrso %{_unitdir}/corosync.service
%{_libexecdir}/lcrso/service_pload.lcrso %{_unitdir}/corosync-notifyd.service
%{_libexecdir}/lcrso/quorum_votequorum.lcrso %dir %{_datadir}/corosync
%{_libexecdir}/lcrso/quorum_testquorum.lcrso %{_datadir}/corosync/corosync
%{_libexecdir}/lcrso/vsf_quorum.lcrso %{_datadir}/corosync/corosync-notifyd
%{_libexecdir}/lcrso/vsf_ykd.lcrso #%else
#%{_initrddir}/corosync
#%{_initrddir}/corosync-notifyd
#%endif
%if %{with upstart}
%{_sysconfdir}/init/corosync.conf
%{_sysconfdir}/init/corosync-notifyd.conf
%endif
%dir %{_localstatedir}/lib/corosync %dir %{_localstatedir}/lib/corosync
%dir %{_localstatedir}/log/cluster %dir %{_localstatedir}/log/cluster
%{_mandir}/man8/confdb_keys.8* %{_mandir}/man8/*.8*
%{_mandir}/man8/corosync_overview.8* %{_mandir}/man5/*.5*
%{_mandir}/man8/corosync.8* %{_mandir}/man3/*.3*
%{_mandir}/man8/corosync-blackbox.8*
%{_mandir}/man8/corosync-objctl.8*
%{_mandir}/man8/corosync-keygen.8*
%{_mandir}/man8/corosync-cfgtool.8*
%{_mandir}/man8/corosync-cpgtool.8*
%{_mandir}/man8/corosync-fplay.8*
%{_mandir}/man8/corosync-pload.8*
%{_mandir}/man8/corosync-quorumtool.8*
%{_mandir}/man5/corosync.conf.5*
# library
#
%package -n libcorosync4 %package -n libcorosync4
Summary: The Corosync Cluster Engine Libraries Summary: The Corosync Cluster Engine Libraries
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Conflicts: corosync < 0.92-7 #Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description -n libcorosync4 %description -n libcorosync4
This package contains corosync libraries. This package contains corosync libraries.
%files -n libcorosync4 %files -n libcorosync4
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE %doc LICENSE
%{_libdir}/libcfg.so.* %{_libdir}/libcfg.so.*
%{_libdir}/libcpg.so.* %{_libdir}/libcpg.so.*
%{_libdir}/libconfdb.so.* %{_libdir}/libcmap.so.*
%{_libdir}/libevs.so.*
%{_libdir}/libtotem_pg.so.* %{_libdir}/libtotem_pg.so.*
%{_libdir}/liblogsys.so.*
%{_libdir}/libcoroipcc.so.*
%{_libdir}/libcoroipcs.so.*
%{_libdir}/libquorum.so.* %{_libdir}/libquorum.so.*
%{_libdir}/libvotequorum.so.* %{_libdir}/libvotequorum.so.*
%{_libdir}/libpload.so.*
%{_libdir}/libsam.so.* %{_libdir}/libsam.so.*
%{_libdir}/libcorosync_common.so.*
%post -n libcorosync4 -p /sbin/ldconfig %post -n libcorosync4 -p /sbin/ldconfig
@ -196,74 +284,42 @@ This package contains corosync libraries.
Summary: The Corosync Cluster Engine Development Kit Summary: The Corosync Cluster Engine Development Kit
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: libcorosync4 = %{version}-%{release} Requires: libcorosync4 = %{version}-%{release}
Requires: libqb-devel
Requires: pkgconfig Requires: pkgconfig
Provides: corosync-devel = %{version}
Obsoletes: corosync-devel < 0.92-7
%description -n libcorosync-devel %description -n libcorosync-devel
This package contains include files and man pages used to develop using This package contains include files and man pages used to develop using
The Corosync Cluster Engine APIs. The Corosync Cluster Engine APIs.
%files -n libcorosync-devel %files -n libcorosync-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE README.devmap %doc LICENSE
%dir %{_includedir}/corosync/ %dir %{_includedir}/corosync/
%{_includedir}/corosync/cs_config.h
%{_includedir}/corosync/corodefs.h %{_includedir}/corosync/corodefs.h
%{_includedir}/corosync/coroipc_types.h
%{_includedir}/corosync/coroipcs.h
%{_includedir}/corosync/coroipcc.h
%{_includedir}/corosync/cfg.h %{_includedir}/corosync/cfg.h
%{_includedir}/corosync/confdb.h %{_includedir}/corosync/cmap.h
%{_includedir}/corosync/corotypes.h %{_includedir}/corosync/corotypes.h
%{_includedir}/corosync/cpg.h %{_includedir}/corosync/cpg.h
%{_includedir}/corosync/evs.h
%{_includedir}/corosync/hdb.h %{_includedir}/corosync/hdb.h
%{_includedir}/corosync/list.h
%{_includedir}/corosync/mar_gen.h
%{_includedir}/corosync/sam.h %{_includedir}/corosync/sam.h
%{_includedir}/corosync/swab.h
%{_includedir}/corosync/quorum.h %{_includedir}/corosync/quorum.h
%{_includedir}/corosync/votequorum.h %{_includedir}/corosync/votequorum.h
%dir %{_includedir}/corosync/totem/ %dir %{_includedir}/corosync/totem/
%{_includedir}/corosync/totem/coropoll.h
%{_includedir}/corosync/totem/totem.h %{_includedir}/corosync/totem/totem.h
%{_includedir}/corosync/totem/totemip.h %{_includedir}/corosync/totem/totemip.h
%{_includedir}/corosync/totem/totempg.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}/libcfg.so
%{_libdir}/libcpg.so %{_libdir}/libcpg.so
%{_libdir}/libconfdb.so %{_libdir}/libcmap.so
%{_libdir}/libevs.so
%{_libdir}/libtotem_pg.so %{_libdir}/libtotem_pg.so
%{_libdir}/liblogsys.so
%{_libdir}/libcoroipcc.so
%{_libdir}/libcoroipcs.so
%{_libdir}/libquorum.so %{_libdir}/libquorum.so
%{_libdir}/libvotequorum.so %{_libdir}/libvotequorum.so
%{_libdir}/libpload.so
%{_libdir}/libsam.so %{_libdir}/libsam.so
%{_libdir}/libcorosync_common.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/cpg_*3* %post -n libcorosync-devel -p /sbin/ldconfig
%{_mandir}/man3/evs_*3* %postun -n libcorosync-devel -p /sbin/ldconfig
%{_mandir}/man3/confdb_*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 %changelog