[sanlock] Synced to latest 1.1.0 code

[Chris Feist]

commit 11fb9581b384387e0825eec8c084218aea609291
Author: Chris Feist <cfeist at redhat.com>
Date:   Thu Feb 17 10:53:23 2011 -0600

    Synced to latest 1.1.0 code

 .gitignore   |    1 +
 sanlock.spec |   19 ++++++++++++-------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34d8a9f..d2d3ee2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sanlock-1.0.tar.gz
+/sanlock-1.1.0.tar.bz2
diff --git a/sanlock.spec b/sanlock.spec
index 9b64c17..8f0f3e2 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,12 +1,12 @@
 Name:           sanlock
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?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.gz
+Source0:        https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libblkid-devel
@@ -24,11 +24,12 @@ access to the shared disks.
 %build
 # upstream does not require configure
 # upstream does not support _smp_mflags
-CFLAGS=$RPM_OPT_FLAGS make -C daemon
+CFLAGS=$RPM_OPT_FLAGS make -C wdmd
+CFLAGS=$RPM_OPT_FLAGS make -C src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C daemon \
+make -C src \
         install LIB_LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT
 
@@ -41,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc daemon/COPYING
+%doc COPYING
 %{_sbindir}/sanlock
 %{_libdir}/libsanlock.so.*
 
@@ -56,12 +57,16 @@ developing applications that use %{name}.
 
 %files          devel
 %defattr(-,root,root,-)
-%doc daemon/COPYING
+%doc COPYING
 %{_libdir}/libsanlock.so
 %{_includedir}/sanlock.h
 %{_includedir}/sanlock_resource.h
 
 %changelog
+* Thu Feb 17 2011 Chris Feist <cfeist at redhat.com> - 1.1.0-1
+- Updated to latest sources
+- Now include wdmd
+
 * Tue Feb 8 2011 Angus Salkeld <asalkeld at redhat.com> - 1.0-2
 * - SPEC: Add docs and make more consistent with the fedora template.
 
diff --git a/sources b/sources
index cda7ddd..5a9dfa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d78328d1869f02fd16fd88b7e7609c0a  sanlock-1.0.tar.gz
+8b54b13b6cdb1918456b57c772609e5c  sanlock-1.1.0.tar.bz2