diff --git a/.gitignore b/.gitignore index 57e8eac..6124a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /sanlock-3.7.3.tar.gz /sanlock-3.8.0.tar.gz /sanlock-3.8.1.tar.gz +/sanlock-3.8.3.tar.gz diff --git a/sanlock.spec b/sanlock.spec index ac90f77..f9921d8 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,6 +1,6 @@ Name: sanlock -Version: 3.8.1 -Release: 8%{?dist} +Version: 3.8.3 +Release: 1%{?dist} Summary: A shared storage lock manager License: GPLv2 and GPLv2+ and LGPLv2+ @@ -21,14 +21,15 @@ Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz -Patch0: 0001-python-Remove-extra-link-args.patch + +# Patch0: 0001-foo.patch %description The sanlock daemon manages leases for applications on hosts using shared storage. %prep %setup -q -%patch0 -p1 +# %patch0 -p1 %build %set_build_flags @@ -37,7 +38,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 PY_VERSION=3 -CFLAGS=$RPM_OPT_FLAGS make -C reset %install rm -rf $RPM_BUILD_ROOT @@ -51,15 +51,11 @@ make -C python \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT \ PY_VERSION=3 -make -C reset \ - install LIBDIR=%{_libdir} \ - DESTDIR=$RPM_BUILD_ROOT 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 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service install -D -m 0644 src/logrotate.sanlock \ $RPM_BUILD_ROOT/etc/logrotate.d/sanlock @@ -72,7 +68,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/sanlk-resetd %pre getent group sanlock > /dev/null || /usr/sbin/groupadd \ @@ -160,30 +155,14 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/libsanlock.pc %{_libdir}/pkgconfig/libsanlock_client.pc -%package -n sanlk-reset -Summary: Host reset daemon and client using sanlock -Requires: sanlock = %{version}-%{release} -Requires: sanlock-lib = %{version}-%{release} - -%description -n sanlk-reset -The sanlk-reset package contains the reset daemon and client. -A cooperating host running the daemon can be reset by a host -running the client, so long as both maintain access to a -common sanlock lockspace. - -%files -n sanlk-reset -%{_sbindir}/sanlk-reset -%{_sbindir}/sanlk-resetd -%{_unitdir}/sanlk-resetd.service -%dir %attr(-,root,root) %{_localstatedir}/run/sanlk-resetd -%{_mandir}/man8/sanlk-reset* - - %changelog +* Wed Feb 24 2021 David Teigland 3.8.3-1 +- New upstream release +- Drop sanlk-reset which is not used. + * Wed Jan 27 2021 Fedora Release Engineering - 3.8.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Sat Aug 08 2020 Nir Soffer - 3.8.1-7 - Enable LTO diff --git a/sources b/sources index 3047c87..8d38967 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sanlock-3.8.1.tar.gz) = 9ed6732c7ba4ba2443188671f97d0c5d9e3e88171b4e41b69e7c07c918784383c5d218f05ad00e134c5a3633159da2b042059df65a53d4e47005b7fdba995744 +SHA512 (sanlock-3.8.3.tar.gz) = c12cef97efdb0827b885099cf38536f4b4aa17c2d9263e039cc8045aa7447c37e4887a0f1d2b685b13eb0a85a493c8a1dde0431c1e82b70d723425f52aac9a5b