[sanlock/f21: 1/2] Update to sanlock-3.2.0

Mon Aug 18 19:55:19 UTC 2014

commit b452e75ad6317093dfb285f7df5be22e55dc7bc7
Author: David Teigland <teigland at redhat.com>
Date:   Mon Aug 18 14:53:12 2014 -0500

    Update to sanlock-3.2.0

 0001-reset-install-man-pages.patch |   23 ++++++++++++++++
 sanlock.spec                       |   50 ++++++++++++++++++++++++++++++------
 2 files changed, 65 insertions(+), 8 deletions(-)
---

diff --git a/0001-reset-install-man-pages.patch b/0001-reset-install-man-pages.patch
new file mode 100644
index 0000000..d3bad0a
--- /dev/null
+++ b/0001-reset-install-man-pages.patch
@@ -0,0 +1,23 @@
+From f4b87765ff8cb4f2d1850c0fd6238ce1fdb1c8a4 Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland at redhat.com>
+Date: Mon, 18 Aug 2014 14:17:07 -0500
+Subject: [PATCH] reset: install man pages
+
+Signed-off-by: David Teigland <teigland at redhat.com>
+---
+ reset/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/reset/Makefile b/reset/Makefile
+index 457da5e5bbfa..d67ceb3a4883 100644
+--- a/reset/Makefile
++++ b/reset/Makefile
+@@ -58,3 +58,5 @@ MANDIR=/usr/share/man
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)/$(BINDIR)
+ 	$(INSTALL) -c -m 755 $(TARGET1) $(TARGET2) $(DESTDIR)/$(BINDIR)
++	$(INSTALL) -m 644 sanlk-reset.8 $(DESTDIR)/$(MANDIR)/man8/
++	$(INSTALL) -m 644 sanlk-resetd.8 $(DESTDIR)/$(MANDIR)/man8/
+-- 
+1.8.3.1
+
diff --git a/sanlock.spec b/sanlock.spec
index d33a10a..f2eb2a5 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -11,8 +11,8 @@
 %endif
 
 Name:           sanlock
-Version:        3.1.0
-Release:        2%{?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-reset-install-man-pages.patch
 
 %description
 The sanlock daemon manages leases for applications running on a cluster
@@ -45,7 +43,7 @@ of hosts with shared storage.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .0001-foo.patch
+%patch0 -p1 -b .0001-reset-install-man-pages.patch
 
 %build
 # upstream does not require configure
@@ -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,36 @@ 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 <teigland at redhat.com> - 3.2.0-1
+- Update to sanlock-3.2.0
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
