From 3c5a0c11bd64b78fd280073e617a9af60e2745bd Mon Sep 17 00:00:00 2001
From: Chris Feist <cfeist@redhat.com>
Date: Tue, 14 Jun 2011 17:26:27 -0500
Subject: [PATCH] Updated to 1.3

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

diff --git a/.gitignore b/.gitignore
index ade104d..29e93b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sanlock-1.0.tar.gz
 /sanlock-1.1.0.tar.bz2
 /sanlock-1.2.0.tar.bz2
+/sanlock-1.3.tar.gz
diff --git a/sanlock.spec b/sanlock.spec
index 31a36a4..98893c1 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,15 +1,17 @@
 Name:           sanlock
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.3
+Release:        6%{?dist}
 Summary:        A shared disk lock manager
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://fedorahosted.org/sanlock/
-Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.bz2
+Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
+Patch0:         sanlock-wdmd-shut-up-warnings.patch
+Patch1:         sanlock-fix-libwdmd-linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libblkid-devel python python-devel
+ExclusiveArch:  i686 x86_64
+BuildRequires:  libblkid-devel libaio-devel python python-devel
 
 Requires:       %{name}-lib = %{version}-%{release}
 
@@ -20,6 +22,8 @@ access to the shared disks.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sanlock-wdmd-shut-up-warnings
+%patch1 -p1 -b .sanlock-fix-libwdmd-linking
 
 %build
 # upstream does not require configure
@@ -46,7 +50,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 -c "sanlock" -s /sbin/nologin -r \
                   -d /var/run/sanlock sanlock 2> /dev/null || :
 
 %post
@@ -91,7 +95,6 @@ access to the shared disks.
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsanlock.so.*
-%{_libdir}/libsanlock_direct.so.*
 %{_libdir}/libwdmd.so.*
 
 %package        python
@@ -125,7 +128,6 @@ developing applications that use %{name}.
 %{_libdir}/libwdmd.so
 %{_includedir}/wdmd.h
 %{_libdir}/libsanlock.so
-%{_libdir}/libsanlock_direct.so
 %{_includedir}/sanlock.h
 %{_includedir}/sanlock_rv.h
 %{_includedir}/sanlock_admin.h
@@ -133,6 +135,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h
 
 %changelog
+* Tue Jun 14 2011 Chris Feist <cfeist@redhat.com> - 1.3.0-6
+- Update to 1.3.0
+
 * Mon May 09 2011 Chris Feist <cfeist@redhat.com> - 1.2.0-3
 - Add python and python-devel to build requires
 
diff --git a/sources b/sources
index 4b6d425..a3103e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-416377e65147801e3576122fd45cdfa6  sanlock-1.2.0.tar.bz2
+daa9cf16bf30a8fd8ce988861be123d3  sanlock-1.3.tar.gz