From fcd8b9e024e1de06836c649b3a4ef8bdce2e7632 Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Fri, 16 Sep 2011 14:10:59 -0500
Subject: [PATCH] Build for latest sanlock (1.8)

---
 .gitignore   |  1 +
 sanlock.spec | 38 +++++++++++++++++++-------------------
 sources      |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index d66715f..56686de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /sanlock-1.3.tar.gz
 /sanlock-1.4.tar.gz
 /sanlock-1.6.tar.gz
+/sanlock-1.8.tar.gz
diff --git a/sanlock.spec b/sanlock.spec
index 3a7b942..a9d5184 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,17 +1,15 @@
 Name:           sanlock
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        A shared disk lock manager
 
 Group:          System Environment/Base
-License:        GPLv2+
+License:        GPLv2, GPLv2+, LGPLv2+
 URL:            https://fedorahosted.org/sanlock/
-Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
-Patch0:		uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libblkid-devel libaio-devel python python-devel
-
 Requires:       %{name}-lib = %{version}-%{release}
+Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
 
 %description
 sanlock uses disk paxos to manage leases on shared storage.
@@ -20,7 +18,6 @@ access to the shared disks.
 
 %prep
 %setup -q
-%patch0 -p1 -b .uuid
 
 %build
 # upstream does not require configure
@@ -32,13 +29,13 @@ CFLAGS=$RPM_OPT_FLAGS make -C python
 %install
 rm -rf $RPM_BUILD_ROOT
 make -C src \
-        install LIB_LIBDIR=%{_libdir} \
+        install LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT
 make -C wdmd \
-        install LIB_LIBDIR=%{_libdir} \
+        install LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT
 make -C python \
-        install LIB_LIBDIR=%{_libdir} \
+        install LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT
 install -D -m 755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock
 install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
@@ -47,7 +44,7 @@ install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/useradd -c "sanlock" -s /sbin/nologin -r \
+/usr/sbin/useradd -u 179 -g 179 -c "sanlock" -s /sbin/nologin -r \
                   -d /var/run/sanlock sanlock 2> /dev/null || :
 
 %post
@@ -68,11 +65,12 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
 %{_initddir}/sanlock
 %{_initddir}/wdmd
 %{_sbindir}/sanlock
 %{_sbindir}/wdmd
+%{_mandir}/man8/wdmd*
+%{_mandir}/man8/sanlock*
 
 %package        lib
 Summary:        A shared disk lock manager library
@@ -90,13 +88,14 @@ access to the shared disks.
 
 %files          lib
 %defattr(-,root,root,-)
-%doc COPYING
 %{_libdir}/libsanlock.so.*
+%{_libdir}/libsanlock_client.so.*
 %{_libdir}/libwdmd.so.*
 
 %package        python
 Summary:        Python bindings for the sanlock library
 Group:          Development/Libraries
+Requires:       %{name}-lib = %{version}-%{release}
 
 %description    python
 The %{name}-python package contains a module that permits applications
@@ -105,15 +104,13 @@ supplied by the sanlock library.
 
 %files          python
 %defattr(-,root,root,-)
-%doc COPYING
-%{python_sitearch}/SANLock-1.0-py2.7.egg-info
-%{python_sitearch}/sanlock.py*
-%{python_sitearch}/sanlockmod.so
+%{python_sitearch}/Sanlock-1.0-py2.7.egg-info
+%{python_sitearch}/sanlock.so
 
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-lib = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -121,10 +118,10 @@ developing applications that use %{name}.
 
 %files          devel
 %defattr(-,root,root,-)
-%doc COPYING
 %{_libdir}/libwdmd.so
 %{_includedir}/wdmd.h
 %{_libdir}/libsanlock.so
+%{_libdir}/libsanlock_client.so
 %{_includedir}/sanlock.h
 %{_includedir}/sanlock_rv.h
 %{_includedir}/sanlock_admin.h
@@ -132,6 +129,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h
 
 %changelog
+* Fri Sep 16 2011 Chris Feist <cfeist@redhat.com - 1.8-1
+- Update to sanlock-1.8
+
 * Fri Aug 19 2011 Dan Horák <dan[at]danny.cz> - 1.6-2
 - build on all arches again
 
diff --git a/sources b/sources
index d279d40..0b9005b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f264c0eee51e7221de950f36593dd419  sanlock-1.6.tar.gz
+8d79874226981c43b658bd1e893aa87e  sanlock-1.8.tar.gz