X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=corosync.spec;h=f0ea567ac764800ce2c6a8d84989e153cdbab168;hb=HEAD;hp=d4f50e24c208f85cbe8b97c2151635c307ba8caa;hpb=cab13e1fccb573ad3a803bfc1ac4fe9c49479b62;p=packages%2Fcorosync.git diff --git a/corosync.spec b/corosync.spec index d4f50e2..39a140d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,44 +1,57 @@ # # Conditional build: %bcond_without apidocs # build apidocs (some man3 pages are provided anyway) +%bcond_without augeas # augeas lens support %bcond_without dbus # DBus events %bcond_without rdma # RDMA support %bcond_without snmp # SNMP protocol support -%bcond_without testagents -%bcond_without watchdog -%bcond_without monitoring -%bcond_without xmlconf +%bcond_without testagents # test agents build +%bcond_without watchdog # watchdog support +%bcond_without monitoring # resource monitoring +%bcond_without qdevices # Quorum devices support +%bcond_without qnetd # Quorum Net Daemon support +%bcond_without xmlconf # XML configuration support +%bcond_without libcgroup # libcgroup support +%bcond_without static_libs # static libraries # Summary: Corosync - OSI Certified implementation of a complete cluster engine Summary(pl.UTF-8): Corosync - implementacja silnika klastrowego certyfikowana przez OSI Name: corosync -Version: 2.1.0 +Version: 2.4.6 Release: 1 License: BSD Group: Base -Source0: https://github.com/downloads/corosync/corosync/corosync-2.1.0.tar.gz -# Source0-md5: dc5152e6dfdb4638ab544e587884483a +#Source0Download: http://corosync.org/download/ +Source0: https://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz +# Source0-md5: 7f9d111c53b760cedd5e3bbcdf93f133 Source1: %{name}.init Source2: %{name}-notifyd.init Source3: %{name}-notifyd.sysconfig -Patch0: %{name}-lib_deps.patch -Patch1: %{name}-install.patch -URL: http://www.corosync.org/ +URL: https://www.corosync.org/ BuildRequires: autoconf >= 2.61 -BuildRequires: automake +BuildRequires: automake >= 1:1.11 %{?with_dbus:BuildRequires: dbus-devel} %{?with_apidocs:BuildRequires: doxygen} +%{?with_apidocs:BuildRequires: graphviz} +BuildRequires: groff +%{?with_libcgroup:BuildRequires: libcgroup-devel} BuildRequires: libqb-devel -%{?with_monitoring:BuildRequires: libstatgrab-devel} %if %{with rdma} -BuildRequires: libibverbs-devel -BuildRequires: libtool -BuildRequires: librdmacm-devel +BuildRequires: libibverbs-devel >= 20 +BuildRequires: librdmacm-devel >= 20 %endif -%{?with_xmlconf:BuildRequires: libxslt} +%{?with_monitoring:BuildRequires: libstatgrab-devel >= 0.90} +BuildRequires: libtool >= 2:2.2.6 %{?with_snmp:BuildRequires: net-snmp-devel} BuildRequires: nss-devel BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.644 +# only for cpghum test program +#BuildRequires: zlib-devel +%{?with_xmlconf:Requires: libxslt-progs} +Requires: rc-scripts +Requires: systemd-units >= 38 +Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -93,6 +106,18 @@ This package contains the Corosync static libraries. %description static -l pl.UTF-8 Ten pakiet zawiera statyczne biblioteki Corosync. +%package testagents +Summary: The Corosync Cluster Engine test agents +Summary(pl.UTF-8): Testowi agenci silnika klastrowego Corosync +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description testagents +This package contains Corosync test agents. + +%description testagents -l pl.UTF-8 +Ten pakiet zawiera testowych agentów silnika Corosync. + %package -n mibs-corosync Summary: Corosync SNMP MIB data Summary(pl.UTF-8): Dane SNMP MIB dla Corosync @@ -105,18 +130,11 @@ Corosync SNMP MIB data. %description -n mibs-corosync -l pl.UTF-8 Dane SNMP MIB dla Corosync. -%package -n corosync-testagents -Summary: The Corosync Cluster Engine Test Agents -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n corosync-testagents -This package contains corosync test agents. - %prep %setup -q -%patch0 -p1 -%patch1 -p1 + +# force regeneration with proper BASHPATH +%{__rm} cts/agents/{cmap-dispatch-deadlock,shm_leak_audit}.sh %build %{__libtoolize} @@ -125,16 +143,23 @@ This package contains corosync test agents. %{__autoheader} %{__automake} %configure \ - %{?with_testagents:--enable-testagents} \ - %{?with_watchdog:--enable-watchdog} \ - %{?with_monitoring:--enable-monitoring} \ - %{?with_xmlconf:--enable-xmlconf} \ + BASHPATH=/bin/bash \ + %{__enable_disable static_libs static} \ + %{?with_augeas:--enable-augeas} \ %{?with_dbus:--enable-dbus} \ + %{?with_libcgroup:--enable-libcgroup} \ + %{?with_monitoring:--enable-monitoring} \ + %{?with_qdevices:--enable-qdevices} \ + %{?with_qnetd:--enable-qnetd} \ %{?with_rdma:--enable-rdma} \ + --disable-silent-rules \ %{?with_snmp:--enable-snmp} \ --enable-systemd \ - --with-systemddir=%{systemdunitdir} \ - --with-initddir=/etc/rc.d/init.d + %{?with_testagents:--enable-testagents} \ + %{?with_watchdog:--enable-watchdog} \ + %{?with_xmlconf:--enable-xmlconf} \ + --with-initddir=/etc/rc.d/init.d \ + --with-systemddir=%{systemdunitdir} %{__make} @@ -143,8 +168,10 @@ This package contains corosync test agents. %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig} +install -d $RPM_BUILD_ROOT/var/log/cluster %{__make} install \ + mibdir=%{_datadir}/mibs \ DESTDIR=$RPM_BUILD_ROOT %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/corosync @@ -157,9 +184,20 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-notifyd install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-notifyd -# init scripts, we provide our own -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/corosync -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/corosync-notifyd +%if %{with qdevices} || %{with qnetd} +install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir} +cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/corosync.conf <