From d5d7f86f2a4d34048654f57ca2fca79f3556aec8 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Mon, 18 Aug 2014 13:54:40 -0500 Subject: [PATCH] Update to sanlock-3.2.0 --- .gitignore | 1 + sanlock.spec | 45 ++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 93d2bed..4d6d5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /sanlock-2.8.tar.gz /sanlock-3.0.0.tar.gz /sanlock-3.1.0.tar.gz +/sanlock-3.2.0.tar.gz diff --git a/sanlock.spec b/sanlock.spec index 055aa5c..b20f736 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -11,8 +11,8 @@ %endif Name: sanlock -Version: 3.1.0 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: A shared storage lock manager Group: System Environment/Base @@ -20,12 +20,10 @@ License: GPLv2 and GPLv2+ and LGPLv2+ URL: https://fedorahosted.org/sanlock/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libblkid-devel libaio-devel python python-devel +ExclusiveArch: x86_64 ppc64 aarch64 %if %{with_systemd} BuildRequires: systemd-units %endif -%if 0%{?rhel} >= 6 -ExclusiveArch: x86_64 -%endif Requires: %{name}-lib = %{version}-%{release} Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd @@ -37,7 +35,7 @@ Requires(postun): systemd-units %endif Source0: http://git.fedorahosted.org/cgit/sanlock.git/snapshot/%{name}-%{version}.tar.gz -#Patch0: foo.patch +#Patch0: 0001-foo.patch %description The sanlock daemon manages leases for applications running on a cluster @@ -54,6 +52,7 @@ 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 rm -rf $RPM_BUILD_ROOT @@ -69,6 +68,9 @@ make -C python \ make -C fence_sanlock \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT +make -C reset \ + install LIBDIR=%{_libdir} \ + DESTDIR=$RPM_BUILD_ROOT %if %{with_systemd} @@ -78,6 +80,7 @@ install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/lib/systemd/systemd-wdmd install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/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 @@ -97,6 +100,7 @@ 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 rm -rf $RPM_BUILD_ROOT @@ -219,7 +223,7 @@ supplied by the sanlock library. %files python %defattr(-,root,root,-) -%{python_sitearch}/Sanlock-1.0-py*.egg-info +%{python_sitearch}/sanlock_python-*.egg-info %{python_sitearch}/sanlock.so %package devel @@ -247,6 +251,7 @@ developing applications that use %{name}. 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 @@ -295,7 +300,33 @@ if [ $1 -ge 1 ] ; then %endif fi +%package -n sanlk-reset +Summary: Host reset daemon and client using sanlock +Group: System Environment/Base +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 +%defattr(-,root,root,-) +%{_sbindir}/sanlk-reset +%{_sbindir}/sanlk-resetd +%if %{with_systemd} +%{_unitdir}/sanlk-resetd.service +%endif +%dir %attr(-,root,root) %{_localstatedir}/run/sanlk-resetd +%{_mandir}/man8/sanlk-reset* + + %changelog +* Mon Aug 18 2014 David Teigland - 3.2.0-1 +- Update to sanlock-3.2.0 + * Mon Aug 18 2014 Fedora Release Engineering - 3.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 13997f3..bf948b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27f9a2183b6386cbd40313d40ee6c24b sanlock-3.1.0.tar.gz +0e507a5cf1c55bc38088dcf12f528fa9 sanlock-3.2.0.tar.gz