[sanlock/f16] Update to sanlock-2.1

[David Teigland]

commit b07f5a1ada3b2ab6a25359cc72311e19ffda920a
Author: David Teigland <teigland at redhat.com>
Date:   Thu Apr 5 09:10:54 2012 -0500

    Update to sanlock-2.1

 sanlock-fix-libwdmd-linking.patch   |   36 -------------------
 sanlock-wdmd-shut-up-warnings.patch |   67 -----------------------------------
 sanlock.spec                        |   22 ++++++++----
 uuid.patch                          |   11 ------
 4 files changed, 15 insertions(+), 121 deletions(-)
---
diff --git a/sanlock.spec b/sanlock.spec
index d3e199f..f95d2c0 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,13 +1,12 @@
 Name:           sanlock
-Version:        1.9
-Release:        8%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        A shared disk lock manager
 
 Group:          System Environment/Base
-License:        GPLv2, GPLv2+, LGPLv2+
+License:        GPLv2 and GPLv2+ and LGPLv2+
 URL:            https://fedorahosted.org/sanlock/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  x86_64
 BuildRequires:  libblkid-devel libaio-devel python python-devel systemd-units
 Requires:       %{name}-lib = %{version}-%{release}
 Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
@@ -47,13 +46,18 @@ install -D -m 0644 init.d/wdmd.service %{buildroot}/%{_unitdir}/wdmd.service
 install -Dm 0644 src/limits.conf \
 	$RPM_BUILD_ROOT/etc/security/limits.d/90-sanlock.conf
 
+install -Dm 0644 src/logrotate.sanlock \
+	$RPM_BUILD_ROOT/etc/logrotate.d/sanlock
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-getent group sanlock > /dev/null || /usr/sbin/groupadd -g 179 sanlock 
-getent passwd sanlock > /dev/null || /usr/sbin/useradd -u 179 -c "sanlock" -s /sbin/nologin -r \
-                  -g 179 -d /var/run/sanlock sanlock
+getent group sanlock > /dev/null || /usr/sbin/groupadd \
+	-g 179 sanlock
+getent passwd sanlock > /dev/null || /usr/sbin/useradd \
+	-u 179 -c "sanlock" -s /sbin/nologin -r \
+	-g 179 -d /var/run/sanlock sanlock
 
 %post
 #/sbin/chkconfig --add sanlock
@@ -82,6 +86,7 @@ fi
 %{_mandir}/man8/wdmd*
 %{_mandir}/man8/sanlock*
 /etc/security/limits.d/90-sanlock.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/sanlock
 
 %package        lib
 Summary:        A shared disk lock manager library
@@ -140,6 +145,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h
 
 %changelog
+* Thu Apr 05 2012 David Teigland <teigland at redhat.com> 2.1-1
+- Update to sanlock-2.1
+
 * Mon Feb 20 2012 Chris Feist <cfeist at redhat.com> - 1.9-8
 - Check if group & user exists before trying to create them