New upstream release
Spec file is also changed to reflect upstream changes Signed-off-by: Jan Friesse <jfriesse@redhat.com>
This commit is contained in:
Jan Friesse
parent
8f4d39243b
commit
7747171407
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ corosync-1.2.7.tar.gz
|
||||
/corosync-1.3.0.tar.gz
|
||||
/corosync-1.3.1.tar.gz
|
||||
/corosync-1.3.2.tar.gz
|
||||
/corosync-1.4.0.tar.gz
|
||||
|
||||
@ -1,13 +1,24 @@
|
||||
# global alphatag svn1211
|
||||
# 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_without snmp
|
||||
%bcond_without dbus
|
||||
# no InfiniBand stack on s390(x)
|
||||
%ifnarch s390 s390x
|
||||
%bcond_without rdma
|
||||
%endif
|
||||
|
||||
Name: corosync
|
||||
Summary: The Corosync Cluster Engine and Application Programming Interfaces
|
||||
Version: 1.3.2
|
||||
Release: 1%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Version: 1.4.0
|
||||
Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: BSD
|
||||
Group: System Environment/Base
|
||||
URL: http://ftp.corosync.org
|
||||
Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: ftp://ftp:user@ftp.corosync.org/downloads/%{name}-%{version}/%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}.tar.gz
|
||||
|
||||
# Runtime bits
|
||||
Requires: corosynclib = %{version}-%{release}
|
||||
@ -18,13 +29,6 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
|
||||
|
||||
# Build bits
|
||||
|
||||
# no InfiniBand stack on s390(x)
|
||||
%ifarch s390 s390x
|
||||
%define have_ib 0
|
||||
%else
|
||||
%define have_ib 1
|
||||
%endif
|
||||
|
||||
%define buildtrunk 0
|
||||
%{?_with_buildtrunk: %define buildtrunk 1}
|
||||
|
||||
@ -32,21 +36,27 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
|
||||
BuildRequires: autoconf automake
|
||||
%endif
|
||||
BuildRequires: nss-devel
|
||||
%if %{have_ib}
|
||||
%if %{with rdma}
|
||||
BuildRequires: libibverbs-devel librdmacm-devel
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
BuildRequires: net-snmp-devel
|
||||
%endif
|
||||
%if %{with dbus}
|
||||
BuildRequires: dbus-devel
|
||||
%endif
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
|
||||
|
||||
%build
|
||||
%if %{buildtrunk}
|
||||
./autogen.sh
|
||||
%endif
|
||||
|
||||
%if %{have_ib}
|
||||
%if %{with rdma}
|
||||
export ibverbs_CFLAGS=-I/usr/include/infiniband \
|
||||
export ibverbs_LIBS=-libverbs \
|
||||
export rdmacm_CFLAGS=-I/usr/include/rdma \
|
||||
@ -54,7 +64,22 @@ export rdmacm_LIBS=-lrdmacm \
|
||||
%endif
|
||||
%{configure} \
|
||||
--enable-nss \
|
||||
%if %{have_ib}
|
||||
%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 dbus}
|
||||
--enable-dbus \
|
||||
%endif
|
||||
%if %{with rdma}
|
||||
--enable-rdma \
|
||||
%endif
|
||||
--with-initddir=%{_initrddir}
|
||||
@ -66,6 +91,11 @@ rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
%if %{with dbus}
|
||||
mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
|
||||
install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
|
||||
%endif
|
||||
|
||||
## tree fixup
|
||||
# drop static libs
|
||||
rm -f %{buildroot}%{_libdir}/*.a
|
||||
@ -93,8 +123,8 @@ fi
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE SECURITY
|
||||
%{_sbindir}/corosync
|
||||
%{_bindir}/corosync-blackbox
|
||||
%{_sbindir}/corosync
|
||||
%{_sbindir}/corosync-keygen
|
||||
%{_sbindir}/corosync-objctl
|
||||
%{_sbindir}/corosync-cfgtool
|
||||
@ -102,12 +132,20 @@ fi
|
||||
%{_sbindir}/corosync-pload
|
||||
%{_sbindir}/corosync-cpgtool
|
||||
%{_sbindir}/corosync-quorumtool
|
||||
%{_sbindir}/corosync-notifyd
|
||||
%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
|
||||
%if %{with dbus}
|
||||
%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
%{_datadir}/snmp/mibs/COROSYNC-MIB.txt
|
||||
%endif
|
||||
%{_initrddir}/corosync
|
||||
%{_initrddir}/corosync-notifyd
|
||||
%dir %{_libexecdir}/lcrso
|
||||
%{_libexecdir}/lcrso/coroparse.lcrso
|
||||
%{_libexecdir}/lcrso/objdb.lcrso
|
||||
@ -131,6 +169,7 @@ fi
|
||||
%{_mandir}/man8/corosync-cpgtool.8*
|
||||
%{_mandir}/man8/corosync-fplay.8*
|
||||
%{_mandir}/man8/corosync-pload.8*
|
||||
%{_mandir}/man8/corosync-notifyd.8*
|
||||
%{_mandir}/man8/corosync-quorumtool.8*
|
||||
%{_mandir}/man5/corosync.conf.5*
|
||||
|
||||
@ -237,6 +276,10 @@ The Corosync Cluster Engine APIs.
|
||||
%{_mandir}/man8/sam_overview.8*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 19 2011 Jan Friesse <jfriesse@redhat.com> - 1.4.0-1
|
||||
- New upstream release
|
||||
- Resync spec file with upstream changes
|
||||
|
||||
* Fri Jul 08 2011 Jan Friesse <jfriesse@redhat.com> - 1.3.2-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user