diff --git a/.gitignore b/.gitignore index 3c22bbb..2464d75 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /sanlock-3.2.1.tar.gz /sanlock-3.2.2.tar.gz /sanlock-3.2.4.tar.gz +/sanlock-3.3.0.tar.gz diff --git a/sanlock.spec b/sanlock.spec index 947b5ad..620ded5 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -4,14 +4,8 @@ %define with_systemd 1 %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%define with_systemd_macros 1 -%else -%define with_systemd_macros 0 -%endif - Name: sanlock -Version: 3.2.4 +Version: 3.3.0 Release: 1%{?dist} Summary: A shared storage lock manager @@ -20,6 +14,7 @@ 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 +ExclusiveArch: x86_64 aarch64 %{power64} %if %{with_systemd} BuildRequires: systemd-units %endif @@ -34,14 +29,14 @@ Requires(postun): systemd-units %endif Source0: http://git.fedorahosted.org/cgit/sanlock.git/snapshot/%{name}-%{version}.tar.gz -#Patch0: 0001-foo.patch +# Patch0: 0001-foo.patch %description The sanlock daemon manages leases for applications on hosts using shared storage. %prep %setup -q -#%patch0 -p1 -b .0001-foo.patch +# %patch0 -p1 -b .0001-foo.patch %build # upstream does not require configure @@ -72,11 +67,10 @@ make -C reset \ %if %{with_systemd} -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 -install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/lib/systemd/systemd-fence_sanlockd +install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service +install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd +install -D -m 0644 init.d/wdmd.service.native $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service +install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-fence_sanlockd install -D -m 0644 init.d/fence_sanlockd.service $RPM_BUILD_ROOT/%{_unitdir}/fence_sanlockd.service install -D -m 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service %else @@ -91,9 +85,6 @@ install -D -m 0644 src/logrotate.sanlock \ install -D -m 0644 src/sanlock.conf \ $RPM_BUILD_ROOT/etc/sanlock/sanlock.conf -install -D -m 0644 init.d/sanlock.sysconfig \ - $RPM_BUILD_ROOT/etc/sysconfig/sanlock - install -D -m 0644 init.d/wdmd.sysconfig \ $RPM_BUILD_ROOT/etc/sysconfig/wdmd @@ -116,66 +107,23 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %post %if %{with_systemd} -%if %{with_systemd_macros} %systemd_post wdmd.service sanlock.service -%else -if [ $1 -eq 1 ] ; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi -%endif -%else -if [ $1 -eq 1 ] ; then - /sbin/chkconfig --add sanlock - /sbin/chkconfig --add wdmd -fi %endif %preun %if %{with_systemd} -%if %{with_systemd_macros} -%systemd_preun sanlock.service -%systemd_preun wdmd.service -%else -if [ $1 = 0 ]; then - /bin/systemctl --no-reload disable sanlock.service > /dev/null 2>&1 || : - /bin/systemctl stop sanlock.service > /dev/null 2>&1 || : - /bin/systemctl --no-reload disable wdmd.service > /dev/null 2>&1 || : - /bin/systemctl stop wdmd.service > /dev/null 2>&1 || : -fi -%endif -%else -if [ $1 = 0 ]; then - /sbin/service sanlock stop > /dev/null 2>&1 - /sbin/chkconfig --del sanlock - /sbin/service wdmd stop > /dev/null 2>&1 - /sbin/chkconfig --del wdmd -fi +%systemd_preun wdmd.service sanlock.service %endif %postun %if %{with_systemd} -%if %{with_systemd_macros} -%systemd_postun_with_restart sanlock.service -%systemd_postun_with_restart wdmd.service -%else -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - /bin/systemctl try-restart sanlock.service >/dev/null 2>&1 || : - /bin/systemctl try-restart wdmd.service >/dev/null 2>&1 || : -fi -%endif -%else -if [ $1 -ge 1 ] ; then - /sbin/service sanlock condrestart >/dev/null 2>&1 || : - /sbin/service wdmd condrestart >/dev/null 2>&1 || : -fi +%systemd_postun %endif %files %defattr(-,root,root,-) %if %{with_systemd} -/lib/systemd/systemd-sanlock -/lib/systemd/systemd-wdmd +/usr/lib/systemd/systemd-wdmd %{_unitdir}/sanlock.service %{_unitdir}/wdmd.service %else @@ -191,10 +139,10 @@ fi %{_mandir}/man8/sanlock* %config(noreplace) %{_sysconfdir}/logrotate.d/sanlock %config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf -%config(noreplace) %{_sysconfdir}/sysconfig/sanlock %config(noreplace) %{_sysconfdir}/sysconfig/wdmd -%doc init.d/sanlock.service.native -%doc init.d/wdmd.service.native +%doc init.d/sanlock +%doc init.d/sanlock.service +%doc init.d/wdmd.service %package lib Summary: A shared storage lock manager library @@ -267,7 +215,7 @@ daemon for using sanlock and wdmd as a cluster fence agent. %files -n fence-sanlock %defattr(-,root,root,-) %if %{with_systemd} -/lib/systemd/systemd-fence_sanlockd +/usr/lib/systemd/systemd-fence_sanlockd %{_unitdir}/fence_sanlockd.service %else %{_initddir}/fence_sanlockd @@ -285,7 +233,6 @@ if [ $1 -eq 1 ] ; then %else /sbin/chkconfig --add fence_sanlockd %endif -ccs_update_schema > /dev/null 2>&1 ||: fi %preun -n fence-sanlock @@ -330,18 +277,28 @@ common sanlock lockspace. %{_mandir}/man8/sanlk-reset* + %changelog +* Mon Feb 22 2016 David Teigland - 3.3.0-1 +- Update to sanlock-3.3.0 + +* Tue Dec 01 2015 David Teigland - 3.2.4-2 +- wdmd: prevent probe while watchdog is used + * Fri Jun 19 2015 David Teigland - 3.2.4-1 - Update to sanlock-3.2.4 -* Fri Jun 19 2015 Fedora Release Engineering - 3.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Fri May 22 2015 David Teigland - 3.2.3-2 +- add pkgconfig files -* Tue Sep 30 2014 David Teigland - 3.2.2-1 -- Update to sanlock-3.2.2 +* Wed May 20 2015 David Teigland - 3.2.3-1 +- Update to sanlock-3.2.3 + +* Thu Oct 30 2014 David Teigland - 3.2.2-2 +- checksum endian fix -* Thu Aug 28 2014 Peter Robinson 3.2.1-2 -- Drop exclusive arch options, it needs to be supported on all arches as per package guidelines +* Mon Sep 29 2014 David Teigland - 3.2.2-1 +- Update to sanlock-3.2.2 * Thu Aug 21 2014 David Teigland - 3.2.1-1 - Update to sanlock-3.2.1 @@ -349,17 +306,20 @@ common sanlock lockspace. * Mon Aug 18 2014 David Teigland - 3.2.0-1 - Update to sanlock-3.2.0 -* Mon Aug 18 2014 Fedora Release Engineering - 3.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +* Wed Jan 29 2014 David Teigland - 3.1.0-2 +- version interface -* Wed Jan 15 2014 David Teigland - 3.1.0-1 +* Tue Jan 07 2014 David Teigland - 3.1.0-1 - Update to sanlock-3.1.0 -* Sun Aug 04 2013 Fedora Release Engineering - 3.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Fri Dec 27 2013 Daniel Mach - 3.0.1-3 +- Mass rebuild 2013-12-27 + +* Thu Aug 01 2013 David Teigland - 3.0.1-2 +- use /usr/lib instead of /lib + +* Wed Jul 31 2013 David Teigland - 3.0.1-1 +- Update to sanlock-3.0.1 * Wed Jul 24 2013 David Teigland - 3.0.0-1 - Update to sanlock-3.0.0 diff --git a/sources b/sources index 5bc0284..36197a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56ed953500608c7bd1bc4ab577f2ce43 sanlock-3.2.4.tar.gz +64a452bb4635fdf638895c5fdaa17be2 sanlock-3.3.0.tar.gz