knet: pass correct handle to knet_handle_compress

[mirror_corosync.git] / corosync.spec.in

diff --git a/corosync.spec.in b/corosync.spec.in
index f2f4addef56e747227eee4d10db2b4805229e25e..e6cb1c9a24a883edcd260882561a7a64b00d7dbe 100644 (file)
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -11,7 +11,10 @@
 %bcond_with dbus
 %bcond_with systemd
 %bcond_with xmlconf
+%bcond_with nozzle
+%bcond_with vqsim
 %bcond_with runautogen
+%bcond_with userflags
 
 %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
 %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
@@ -28,6 +31,9 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git
 # The automatic dependency overridden in favor of explicit version lock
 Requires: corosynclib%{?_isa} = %{version}-%{release}
 
+# Support crypto reload
+Requires: libknet1 >= 1.18
+
 # Build bits
 BuildRequires: gcc
 
@@ -37,12 +43,7 @@ BuildRequires: groff-full
 BuildRequires: groff
 %endif
 BuildRequires: libqb-devel
-%if 0%{?suse_version}
-BuildRequires: mozilla-nss-devel
-%else
-BuildRequires: nss-devel
-%endif
-BuildRequires: libknet1-devel
+BuildRequires: libknet1-devel >= 1.18
 BuildRequires: zlib-devel
 %if %{with runautogen}
 BuildRequires: autoconf automake libtool
@@ -60,6 +61,9 @@ BuildRequires: dbus-1-devel
 BuildRequires: dbus-devel
 %endif
 %endif
+%if %{with nozzle}
+BuildRequires: libnozzle1-devel
+%endif
 %if %{with systemd}
 %{?systemd_requires}
 BuildRequires: systemd
@@ -71,6 +75,9 @@ Requires(preun): /sbin/chkconfig
 %if %{with xmlconf}
 Requires: libxslt
 %endif
+%if %{with vqsim}
+BuildRequires: readline-devel
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
@@ -98,6 +105,15 @@ Requires: libxslt
 %endif
 %if %{with xmlconf}
        --enable-xmlconf \
+%endif
+%if %{with nozzle}
+       --enable-nozzle \
+%endif
+%if %{with vqsim}
+       --enable-vqsim \
+%endif
+%if %{with userflags}
+       --enable-user-flags \
 %endif
        --with-initddir=%{_initrddir} \
        --with-systemddir=%{_unitdir} \
@@ -167,7 +183,6 @@ fi
 %{_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*
@@ -176,7 +191,6 @@ fi
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
-%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync
 %config(noreplace) %{_sysconfdir}/logrotate.d/corosync
@@ -206,7 +220,7 @@ fi
 %{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
 %{_mandir}/man5/votequorum.5*
-%{_mandir}/man8/cmap_keys.8*
+%{_mandir}/man7/cmap_keys.7*
 
 # library
 #
@@ -221,7 +235,6 @@ This package contains corosync libraries.
 %{_libdir}/libcfg.so.*
 %{_libdir}/libcpg.so.*
 %{_libdir}/libcmap.so.*
-%{_libdir}/libtotem_pg.so.*
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libsam.so.*
@@ -235,7 +248,8 @@ This package contains corosync libraries.
 Summary: The Corosync Cluster Engine Development Kit
 Requires: corosynclib%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
-Provides: corosync-devel = %{version}
+Provides: corosync-devel = %{version}-%{release}
+Provides: corosync-devel%{?_isa} = %{version}-%{release}
 
 %description -n corosynclib-devel
 This package contains include files and man pages used to develop using
@@ -253,15 +267,9 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/sam.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
-%dir %{_includedir}/corosync/totem/
-%{_includedir}/corosync/totem/totem.h
-%{_includedir}/corosync/totem/totemip.h
-%{_includedir}/corosync/totem/totempg.h
-%{_includedir}/corosync/totem/totemstats.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
 %{_libdir}/libcmap.so
-%{_libdir}/libtotem_pg.so
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libsam.so
@@ -273,6 +281,25 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man3/sam_*3*
 %{_mandir}/man3/cmap_*3*
 
+%if %{with vqsim}
+%package -n corosync-vqsim
+Summary: The Corosync Cluster Engine - Votequorum Simulator
+Requires: corosynclib%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n corosync-vqsim
+A command-line simulator for the corosync votequorum subsystem.
+It uses the same code as the corosync quorum system but forks
+them into subprocesses to simulate nodes.
+Nodes can be added and removed as well as partitioned (to simulate
+network splits)
+
+%files -n corosync-vqsim
+%doc LICENSE
+%{_bindir}/corosync-vqsim
+%{_mandir}/man8/corosync-vqsim.8*
+%endif
+
 %changelog
 * @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version