From 9cf0c878b2d8956314f5fa49b6e2ec2d4a4b01fb Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 12 Dec 2017 12:00:38 -0600 Subject: [PATCH] Update to sanlock-3.6.0, drop fence_sanlock --- sanlock.spec | 70 +++++----------------------------------------------- 1 file changed, 6 insertions(+), 64 deletions(-) diff --git a/sanlock.spec b/sanlock.spec index 582ad3a..fe8a595 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -5,13 +5,13 @@ %endif Name: sanlock -Version: 3.5.0 -Release: 6%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: A shared storage lock manager Group: System Environment/Base License: GPLv2 and GPLv2+ and LGPLv2+ -URL: https://pagure.org/sanlock/ +URL: https://pagure.io/sanlock/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libblkid-devel libaio-devel python python-devel %if %{with_systemd} @@ -43,7 +43,6 @@ The sanlock daemon manages leases for applications on hosts using shared storage CFLAGS=$RPM_OPT_FLAGS make -C wdmd CFLAGS=$RPM_OPT_FLAGS make -C src CFLAGS=$RPM_OPT_FLAGS make -C python -CFLAGS=$RPM_OPT_FLAGS make -C fence_sanlock CFLAGS=$RPM_OPT_FLAGS make -C reset %install @@ -57,9 +56,6 @@ make -C wdmd \ make -C python \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT -make -C fence_sanlock \ - install LIBDIR=%{_libdir} \ - DESTDIR=$RPM_BUILD_ROOT make -C reset \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT @@ -69,13 +65,10 @@ make -C reset \ install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd install -D -m 0644 init.d/wdmd.service.native $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service -install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-fence_sanlockd -install -D -m 0644 init.d/fence_sanlockd.service $RPM_BUILD_ROOT/%{_unitdir}/fence_sanlockd.service install -D -m 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service %else install -D -m 0755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd -install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/%{_initddir}/fence_sanlockd %endif install -D -m 0644 src/logrotate.sanlock \ @@ -89,8 +82,6 @@ install -D -m 0644 init.d/wdmd.sysconfig \ install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock -install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlock -install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlockd install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlk-resetd %clean @@ -206,58 +197,6 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/libsanlock.pc %{_libdir}/pkgconfig/libsanlock_client.pc -%package -n fence-sanlock -Summary: Fence agent using sanlock and wdmd -Group: System Environment/Base -Requires: sanlock = %{version}-%{release} -Requires: sanlock-lib = %{version}-%{release} - -%description -n fence-sanlock -The fence-sanlock package contains the fence agent and -daemon for using sanlock and wdmd as a cluster fence agent. - -%files -n fence-sanlock -%defattr(-,root,root,-) -%if %{with_systemd} -/usr/lib/systemd/systemd-fence_sanlockd -%{_unitdir}/fence_sanlockd.service -%else -%{_initddir}/fence_sanlockd -%endif -%{_sbindir}/fence_sanlock -%{_sbindir}/fence_sanlockd -%dir %attr(-,root,root) %{_localstatedir}/run/fence_sanlock -%dir %attr(-,root,root) %{_localstatedir}/run/fence_sanlockd -%{_mandir}/man8/fence_sanlock* - -%post -n fence-sanlock -if [ $1 -eq 1 ] ; then -%if %{with_systemd} - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%else - /sbin/chkconfig --add fence_sanlockd -%endif -fi - -%preun -n fence-sanlock -if [ $1 = 0 ]; then -%if %{with_systemd} - /bin/systemctl --no-reload fence_sanlockd.service > /dev/null 2>&1 || : -%else - /sbin/service fence_sanlockd stop > /dev/null 2>&1 - /sbin/chkconfig --del fence_sanlockd -%endif -fi - -%postun -n fence-sanlock -if [ $1 -ge 1 ] ; then -%if %{with_systemd} - /bin/systemctl try-restart fence_sanlockd.service > /dev/null 2>&1 || : -%else - /sbin/service fence_sanlockd condrestart >/dev/null 2>&1 || : -%endif -fi - %package -n sanlk-reset Summary: Host reset daemon and client using sanlock Group: System Environment/Base @@ -283,6 +222,9 @@ common sanlock lockspace. %changelog +* Tue Dec 12 2017 David Teigland - 3.6.0-1 +- Update to sanlock-3.6.0, drop fence_sanlock + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 3.5.0-6 - Add Provides for the old name without %%_isa