[sanlock/f17] Update to sanlock-2.1

[David Teigland]

commit d3e4a616cd6ded38423b65eeac4af4415344ee82
Author: David Teigland <teigland at redhat.com>
Date:   Wed Mar 21 16:36:47 2012 -0500

    Update to sanlock-2.1

 .gitignore   |    1 +
 sanlock.spec |   25 ++++++++++++++++++++-----
 sources      |    2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56686de..7782a60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /sanlock-1.4.tar.gz
 /sanlock-1.6.tar.gz
 /sanlock-1.8.tar.gz
+/sanlock-2.1.tar.gz
diff --git a/sanlock.spec b/sanlock.spec
index f22aa92..59d16a2 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,10 +1,10 @@
 Name:           sanlock
-Version:        1.8
-Release:        2%{?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)
 BuildRequires:  libblkid-devel libaio-devel python python-devel
@@ -37,15 +37,25 @@ make -C wdmd \
 make -C python \
         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
 
+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
-/usr/sbin/useradd -u 179 -g 179 -c "sanlock" -s /sbin/nologin -r \
-                  -d /var/run/sanlock sanlock 2> /dev/null || :
+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
@@ -71,6 +81,8 @@ fi
 %{_sbindir}/wdmd
 %{_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
@@ -129,6 +141,9 @@ developing applications that use %{name}.
 %{_includedir}/sanlock_direct.h
 
 %changelog
+* Wed Mar 21 2012 David Teigland <teigland at redhat.com> - 2.1-1
+- Update to sanlock-2.1
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 0b9005b..0724b23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d79874226981c43b658bd1e893aa87e  sanlock-1.8.tar.gz
+4e3af4aa5a2c0aaff15fb0b1a38a00ee  sanlock-2.1.tar.gz