[sanlock/f17] update to 2.3 release
David Teigland
teigland at fedoraproject.org
Wed May 30 21:16:04 UTC 2012
commit e15699a699e4a6a7a8dfb587fe9e530e45aab5a2
Author: David Teigland <teigland at redhat.com>
Date: Wed May 30 16:15:44 2012 -0500
update to 2.3 release
.gitignore | 1 +
sanlock.spec | 81 ++++++++++++++++++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 67 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70d6a90..1aec103 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/sanlock-1.8.tar.gz
/sanlock-2.1.tar.gz
/sanlock-2.2.tar.gz
+/sanlock-2.3.tar.gz
diff --git a/sanlock.spec b/sanlock.spec
index 6a536f7..732472a 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,5 +1,5 @@
Name: sanlock
-Version: 2.2
+Version: 2.3
Release: 1%{?dist}
Summary: A shared disk lock manager
@@ -7,6 +7,7 @@ Group: System Environment/Base
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
Requires: %{name}-lib = %{version}-%{release}
Source0: https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
@@ -38,13 +39,15 @@ make -C python \
install LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
-install -D -m 0755 init.d/sanlock %{buildroot}/lib/systemd/systemd-sanlock
-install -D -m 0644 init.d/sanlock.service %{buildroot}/%{_unitdir}/sanlock.service
-install -D -m 0755 init.d/wdmd %{buildroot}/lib/systemd/systemd-wdmd
-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
+%if 0%{?fedora} >= 16
+install -D -m 0755 init.d/sanlock $RPM_BUILD_ROOT/lib/systemd/systemd-sanlock
+install -D -m 0644 init.d/sanlock.service $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service
+install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/lib/systemd/systemd-wdmd
+install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
+%else
+install -D -m 755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock
+install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
+%endif
install -Dm 0644 src/logrotate.sanlock \
$RPM_BUILD_ROOT/etc/logrotate.d/sanlock
@@ -63,28 +66,56 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
-g 179 -d /var/run/sanlock sanlock
%post
+if [ $1 -eq 1 ] ; then
+%if 0%{?fedora} >= 16
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%else
+ /sbin/chkconfig --add sanlock
+ /sbin/chkconfig --add wdmd
+%endif
+fi
%preun
if [ $1 = 0 ]; then
- /sbin/service sanlock stop > /dev/null 2>&1
- /sbin/service wdmd stop > /dev/null 2>&1
+%if 0%{?fedora} >= 16
+ /bin/systemctl --no-reload sanlock.service > /dev/null 2>&1 || :
+ /bin/systemctl --no-reload wdmd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop sanlock.service > /dev/null 2>&1 || :
+ /bin/systemctl stop wdmd.service > /dev/null 2>&1 || :
+%else
+ /sbin/service sanlock stop > /dev/null 2>&1
+ /sbin/service wdmd stop > /dev/null 2>&1
+ /sbin/chkconfig --del sanlock
+ /sbin/chkconfig --del wdmd
+%endif
fi
%postun
-#/sbin/service sanlock condrestart >/dev/null 2>&1 || :
-#/sbin/service wdmd condrestart >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+%if 0%{?fedora} >= 16
+ /bin/systemctl try-restart sanlock.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart wdmd.service >/dev/null 2>&1 || :
+%else
+ /sbin/service sanlock condrestart >/dev/null 2>&1 || :
+ /sbin/service wdmd condrestart >/dev/null 2>&1 || :
+%endif
+fi
%files
%defattr(-,root,root,-)
+%if 0%{?fedora} >= 16
/lib/systemd/systemd-sanlock
/lib/systemd/systemd-wdmd
%{_unitdir}/sanlock.service
%{_unitdir}/wdmd.service
+%else
+%{_initddir}/sanlock
+%{_initddir}/wdmd
+%endif
%{_sbindir}/sanlock
%{_sbindir}/wdmd
%{_mandir}/man8/wdmd*
%{_mandir}/man8/sanlock*
-/etc/security/limits.d/90-sanlock.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sanlock
%config(noreplace) %{_sysconfdir}/sysconfig/sanlock
@@ -120,7 +151,7 @@ supplied by the sanlock library.
%files python
%defattr(-,root,root,-)
-%{python_sitearch}/Sanlock-1.0-py2.7.egg-info
+%{python_sitearch}/Sanlock-1.0-py*.egg-info
%{python_sitearch}/sanlock.so
%package devel
@@ -145,6 +176,12 @@ developing applications that use %{name}.
%{_includedir}/sanlock_direct.h
%changelog
+* Wed May 30 2012 David Teigland <teigland at redhat.com> - 2.3
+- Update to sanlock-2.3
+
+* Fri May 25 2012 Federico Simoncelli <fsimonce at redhat.com> 2.2-2
+- Support multiple platforms in the spec file
+
* Mon May 07 2012 David Teigland <teigland at redhat.com> - 2.2-1
- Update to sanlock-2.2
@@ -154,8 +191,11 @@ developing applications that use %{name}.
* 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
+* Fri Mar 02 2012 David Teigland <teigland at redhat.com> - 2.0-1
+- Update to sanlock-2.0
+
+* Tue Sep 20 2011 David Teigland <teigland at redhat.com> - 1.8-2
+- fix useradd command in spec file
* Fri Sep 16 2011 Chris Feist <cfeist at redhat.com - 1.8-1
- Update to sanlock-1.8
@@ -163,6 +203,15 @@ developing applications that use %{name}.
* Fri Aug 19 2011 Dan Horák <dan[at]danny.cz> - 1.6-2
- build on all arches again
+* Sun Aug 07 2011 Chris Feist <cfeist at redhat.com> - 1.7-4
+- Fix for minor file include issues
+
+* Fri Aug 05 2011 David Teigland <teigland at redhat.com> - 1.7-3
+- fix man page mode
+
+* Fri Aug 05 2011 David Teigland <teigland at redhat.com> - 1.7-1
+- Update to sanlock-1.7
+
* Fri Jul 08 2011 David Teigland <teigland at redhat.com> - 1.6-1
- Update to sanlock-1.6
diff --git a/sources b/sources
index 7f9dca4..41c560c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00e1fb3131a66bdb7ed7418de5abc9c8 sanlock-2.2.tar.gz
+17ddc7c7b9dfab30e82890b6d14cda57 sanlock-2.3.tar.gz
More information about the scm-commits
mailing list