Updated to 1.2.0 sanlock

.gitignore

@@ -1,2 +1,3 @@
 /sanlock-1.0.tar.gz
 /sanlock-1.1.0.tar.bz2
+/sanlock-1.2.0.tar.bz2

sanlock.spec

@@ -1,6 +1,6 @@
 Name:           sanlock
-Version:        1.1.0
+Version:        1.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A shared disk lock manager
 
 Group:          System Environment/Base
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libblkid-devel
 
-#Requires: <nothing>
+Requires:       %{name}-lib = %{version}-%{release}
 
 %description
 sanlock uses disk paxos to manage leases on shared storage.
@@ -26,6 +26,7 @@ access to the shared disks.
 # upstream does not support _smp_mflags
 CFLAGS=$RPM_OPT_FLAGS make -C wdmd
 CFLAGS=$RPM_OPT_FLAGS make -C src
+CFLAGS=$RPM_OPT_FLAGS make -C python
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -35,22 +36,79 @@ make -C src \
 make -C wdmd \
         install LIB_LIBDIR=%{_libdir} \
         DESTDIR=$RPM_BUILD_ROOT
+make -C python \
+        install LIB_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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%pre
+/usr/sbin/useradd -c "Sanlock" -s /sbin/nologin -r \
+                  -d /var/run/sanlock sanlock 2> /dev/null || :
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/chkconfig --add sanlock
+/sbin/chkconfig --add wdmd
+
+%preun
+if [ $1 = 0 ]; then
+	/sbin/service sanlock stop > /dev/null 2>&1
+	/sbin/service wdmd stop > /dev/null 2>&1
+	/sbin/chkconfig --del sanlock
+	/sbin/chkconfig --del wdmd
+fi
+
+%postun
+#/sbin/service sanlock condrestart >/dev/null 2>&1 || :
+#/sbin/service wdmd condrestart >/dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING
+%{_initddir}/sanlock
+%{_initddir}/wdmd
 %{_sbindir}/sanlock
 %{_sbindir}/wdmd
+
+%package        lib
+Summary:        A shared disk lock manager library
+Group:          System Environment/Libraries
+
+%description    lib
+The %{name}-lib package contains the runtime libraries for sanlock,
+a shared disk lock manager.
+Hosts connected to a common SAN can use this to synchronize their
+access to the shared disks.
+
+%post lib -p /sbin/ldconfig
+
+%postun lib -p /sbin/ldconfig
+
+%files          lib
+%defattr(-,root,root,-)
+%doc COPYING
 %{_libdir}/libsanlock.so.*
-%{_libdir}/libwdmd.*
+%{_libdir}/libsanlock_direct.so.*
-%{_includedir}/wdmd.h
+%{_libdir}/libwdmd.so.*
+
+%package        python
+Summary:        Python bindings for the sanlock library
+Group:          Development/Libraries
+
+%description    python
+The %{name}-python package contains a module that permits applications
+written in the Python programming language to use the interface
+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
 
 %package        devel
 Summary:        Development files for %{name}
@@ -64,11 +122,24 @@ developing applications that use %{name}.
 %files          devel
 %defattr(-,root,root,-)
 %doc COPYING
+%{_libdir}/libwdmd.so
+%{_includedir}/wdmd.h
 %{_libdir}/libsanlock.so
+%{_libdir}/libsanlock_direct.so
 %{_includedir}/sanlock.h
+%{_includedir}/sanlock_rv.h
+%{_includedir}/sanlock_admin.h
 %{_includedir}/sanlock_resource.h
+%{_includedir}/sanlock_direct.h
 
 %changelog
+* Mon May 09 2011 Chris Feist <cfeist@redhat.com> - 1.2.0-1
+- Use latest sources
+- Sync .spec file
+
+* Mon Apr  4 2011 Federico Simoncelli <fsimonce@redhat.com> - 1.1.0-3
+- Add sanlock_admin.h header
+
 * Fri Feb 18 2011 Chris Feist <cfeist@redhat.com> - 1.1.0-2
 - Fixed install for wdmd
 
@@ -77,7 +148,7 @@ developing applications that use %{name}.
 - Now include wdmd
 
 * Tue Feb 8 2011 Angus Salkeld <asalkeld@redhat.com> - 1.0-2
-* - SPEC: Add docs and make more consistent with the fedora template.
+- SPEC: Add docs and make more consistent with the fedora template
 
 * Mon Jan 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.0-1
 - first cut at rpm packaging

sources

@@ -1 +1 @@
-8b54b13b6cdb1918456b57c772609e5c  sanlock-1.1.0.tar.bz2
+416377e65147801e3576122fd45cdfa6  sanlock-1.2.0.tar.bz2