[packages/corosync/corosync-3: 9/14] - updated to 3.0.3 - -testagents, qdevices (qnetd) and libtotem_pg are gone

Mon Jul 22 20:29:57 CEST 2024

commit 65841ba7d5ea0c4853410dd633a18aea24d82ad5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 9 13:28:09 2020 +0100

    - updated to 3.0.3
    - -testagents, qdevices (qnetd) and libtotem_pg are gone

 corosync.spec | 112 ++++------------------------------------------------------
 1 file changed, 7 insertions(+), 105 deletions(-)
---

diff --git a/corosync.spec b/corosync.spec
index 39a140d..a7347fd 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -3,27 +3,22 @@
 %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	# 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.4.6
+Version:	3.0.3
 Release:	1
 License:	BSD
 Group:		Base
 #Source0Download: http://corosync.org/download/
 Source0:	https://build.clusterlabs.org/corosync/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	7f9d111c53b760cedd5e3bbcdf93f133
+# Source0-md5:	4ba2f56101cea4f5d67113ca42ebf686
 Source1:	%{name}.init
 Source2:	%{name}-notifyd.init
 Source3:	%{name}-notifyd.sysconfig
@@ -34,12 +29,7 @@ BuildRequires:	automake >= 1:1.11
 %{?with_apidocs:BuildRequires:	doxygen}
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	groff
-%{?with_libcgroup:BuildRequires:	libcgroup-devel}
 BuildRequires:	libqb-devel
-%if %{with rdma}
-BuildRequires:	libibverbs-devel >= 20
-BuildRequires:	librdmacm-devel >= 20
-%endif
 %{?with_monitoring:BuildRequires:	libstatgrab-devel >= 0.90}
 BuildRequires:	libtool >= 2:2.2.6
 %{?with_snmp:BuildRequires:	net-snmp-devel}
@@ -53,6 +43,7 @@ Requires:	rc-scripts
 Requires:	systemd-units >= 38
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	corosync-testagents < 3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # short_service_name_get() is defined in executable
@@ -106,18 +97,6 @@ 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
@@ -133,9 +112,6 @@ Dane SNMP MIB dla Corosync.
 %prep
 %setup -q
 
-# force regeneration with proper BASHPATH
-%{__rm} cts/agents/{cmap-dispatch-deadlock,shm_leak_audit}.sh
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -147,15 +123,10 @@ Dane SNMP MIB dla Corosync.
 	%{__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_testagents:--enable-testagents} \
 	%{?with_watchdog:--enable-watchdog} \
 	%{?with_xmlconf:--enable-xmlconf} \
 	--with-initddir=/etc/rc.d/init.d \
@@ -184,18 +155,6 @@ 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
 
-%if %{with qdevices} || %{with qnetd}
-install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
-cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/corosync.conf <<EOF
-%if %{with qdevices}
-d /var/run/corosync-qdevice 0770 root root -
-%endif
-%if %{with qnetd}
-d /var/run/corosync-qnetd 0770 root root -
-%endif
-EOF
-%endif
-
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -228,10 +187,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE README.recovery SECURITY conf/corosync.conf.example*
-%if %{with xmlconf}
-%doc conf/corosync.xml.example*
-%endif
+%doc AUTHORS ChangeLog LICENSE README.recovery conf/corosync.conf.example*
 %attr(754,root,root) /etc/rc.d/init.d/corosync
 %attr(754,root,root) /etc/rc.d/init.d/corosync-notifyd
 %verify(not md5 mtime size) %config(noreplace) /etc/logrotate.d/%{name}
@@ -241,9 +197,6 @@ fi
 %dir %{_sysconfdir}/corosync/uidgid.d
 %{systemdunitdir}/corosync.service
 %{systemdunitdir}/corosync-notifyd.service
-%if %{with qdevices} || %{with qnetd}
-%{systemdtmpfilesdir}/corosync.conf
-%endif
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/corosync/corosync.conf
 %attr(755,root,root) %{_bindir}/corosync-blackbox
 %attr(755,root,root) %{_sbindir}/corosync
@@ -255,6 +208,7 @@ fi
 %attr(755,root,root) %{_sbindir}/corosync-quorumtool
 %{_mandir}/man5/corosync.conf.5*
 %{_mandir}/man5/votequorum.5*
+%{_mandir}/man7/corosync_overview.7*
 %{_mandir}/man8/corosync.8*
 %{_mandir}/man8/corosync-blackbox.8*
 %{_mandir}/man8/corosync-cmapctl.8*
@@ -265,18 +219,9 @@ fi
 %{_mandir}/man8/corosync-quorumtool.8*
 # should be man7...
 %{_mandir}/man8/cmap_keys.8*
-%{_mandir}/man8/cmap_overview.8*
-%{_mandir}/man8/corosync_overview.8*
-%{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/sam_overview.8*
-%{_mandir}/man8/votequorum_overview.8*
-%{_mandir}/man8/quorum_overview.8*
 %dir %{_datadir}/corosync
-%attr(755,root,root) %{_datadir}/%{name}/corosync
-%attr(755,root,root) %{_datadir}/%{name}/corosync-notifyd
 %if %{with xmlconf}
 %attr(755,root,root) %{_bindir}/corosync-xmlproc
-%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
 %{_datadir}/corosync/xml2conf.xsl
 %{_mandir}/man8/corosync-xmlproc.8*
 %{_mandir}/man5/corosync.xml.5*
@@ -290,36 +235,11 @@ fi
 %endif
 %dir /var/lib/corosync
 %attr(700,root,root) %dir /var/log/cluster
-%if %{with qdevices}
-%attr(755,root,root) %{_sbindir}/corosync-qdevice
-%attr(755,root,root) %{_sbindir}/corosync-qdevice-net-certutil
-%attr(755,root,root) %{_sbindir}/corosync-qdevice-tool
-%{_datadir}/corosync/corosync-qdevice
-%{systemdunitdir}/corosync-qdevice.service
-%dir %{_sysconfdir}/corosync/qdevice
-%attr(770,root,root) %dir %{_sysconfdir}/corosync/qdevice/net
-%attr(770,root,root) %dir /var/run/corosync-qdevice
-%{_mandir}/man8/corosync-qdevice.8*
-%{_mandir}/man8/corosync-qdevice-net-certutil.8*
-%{_mandir}/man8/corosync-qdevice-tool.8*
-%endif
-%if %{with qnetd}
-%attr(755,root,root) %{_bindir}/corosync-qnetd
-%attr(755,root,root) %{_bindir}/corosync-qnetd-certutil
-%attr(755,root,root) %{_bindir}/corosync-qnetd-tool
-%{_datadir}/corosync/corosync-qnetd
-%{systemdunitdir}/corosync-qnetd.service
-%attr(770,root,root) %dir %{_sysconfdir}/corosync/qnetd
-%attr(770,root,root) %dir /var/run/corosync-qnetd
-%{_mandir}/man8/corosync-qnetd.8*
-%{_mandir}/man8/corosync-qnetd-certutil.8*
-%{_mandir}/man8/corosync-qnetd-tool.8*
-%endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcfg.so.6.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcfg.so.6
+%attr(755,root,root) %{_libdir}/libcfg.so.7.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcfg.so.7
 %attr(755,root,root) %{_libdir}/libcmap.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcmap.so.4
 %attr(755,root,root) %{_libdir}/libcorosync_common.so.4.*.*
@@ -330,8 +250,6 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsam.so.4
 %attr(755,root,root) %{_libdir}/libquorum.so.5.*.*
 %attr(755,root,root) %ghost %{_libdir}/libquorum.so.5
-%attr(755,root,root) %{_libdir}/libtotem_pg.so.5.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtotem_pg.so.5
 %attr(755,root,root) %{_libdir}/libvotequorum.so.8.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvotequorum.so.8
 
@@ -344,7 +262,6 @@ fi
 %attr(755,root,root) %{_libdir}/libcpg.so
 %attr(755,root,root) %{_libdir}/libsam.so
 %attr(755,root,root) %{_libdir}/libquorum.so
-%attr(755,root,root) %{_libdir}/libtotem_pg.so
 %attr(755,root,root) %{_libdir}/libvotequorum.so
 %{_includedir}/corosync
 %{_pkgconfigdir}/corosync.pc
@@ -354,7 +271,6 @@ fi
 %{_pkgconfigdir}/libcpg.pc
 %{_pkgconfigdir}/libquorum.pc
 %{_pkgconfigdir}/libsam.pc
-%{_pkgconfigdir}/libtotem_pg.pc
 %{_pkgconfigdir}/libvotequorum.pc
 %{_mandir}/man3/cmap_*.3*
 %{_mandir}/man3/cpg_*.3*
@@ -371,23 +287,9 @@ fi
 %{_libdir}/libcpg.a
 %{_libdir}/libsam.a
 %{_libdir}/libquorum.a
-%{_libdir}/libtotem_pg.a
 %{_libdir}/libvotequorum.a
 %endif
 
-%if %{with testagents}
-%files testagents
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/cpg_test_agent
-%attr(755,root,root) %{_bindir}/sam_test_agent
-%attr(755,root,root) %{_bindir}/votequorum_test_agent
-%dir %{_datadir}/corosync/tests
-%{_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
-%endif
-
 %if %{with snmp}
 %files -n mibs-corosync
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/corosync.git/commitdiff/c3f08f494de4e2ee6b949f193a18ca9dfd464462

