SHA256
1
0
forked from pool/sanlock

- Update to sanlock 3.2.4

- Add conf file sanlock.conf
  - Add pkgconfig files
  - Numerous improvements and bug fixes.  For details, see
    https://git.fedorahosted.org/cgit/sanlock.git/log/

OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=25
This commit is contained in:
James Fehlig 2015-06-19 18:04:42 +00:00 committed by Git OBS Bridge
parent a2ab379904
commit 374ed6e8df
7 changed files with 34 additions and 19 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5a2cc0263ae2912b6e4c32544cb603e936ab22716eb4cc57f8d7b2d3c3959a7
size 149116

3
sanlock-3.2.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f0054904d15d824ca09e55fe2173dfe4b48bf0e4554bd250ca189103ff5ca8c
size 153112

View File

@ -2,7 +2,7 @@ Index: src/main.c
===================================================================
--- src/main.c.orig
+++ src/main.c
@@ -58,6 +58,10 @@
@@ -59,6 +59,10 @@
#define SIGRUNPATH 100 /* anything that's not SIGTERM/SIGKILL */

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 19 10:48:55 MDT 2015 - jfehlig@suse.com
- Update to sanlock 3.2.4
- Add conf file sanlock.conf
- Add pkgconfig files
- Numerous improvements and bug fixes. For details, see
https://git.fedorahosted.org/cgit/sanlock.git/log/
-------------------------------------------------------------------
Sat Mar 21 16:26:54 UTC 2015 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sanlock
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,7 +24,7 @@
%endif
Name: sanlock
Version: 3.2.2
Version: 3.2.4
Release: 0
Summary: A shared disk lock manager
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+
@ -144,6 +144,7 @@ make -C fence_sanlock \
install LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
%endif
install -D -m 755 src/sanlock.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sanlock/sanlock.conf
install -D -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
install -D -m 755 %SOURCE4 $RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
%if %{with_systemd}
@ -239,6 +240,8 @@ install -Dm 0644 src/logrotate.sanlock \
%files
%defattr(-,root,root,-)
%dir %attr(0700, root, root) %{_sysconfdir}/sanlock/
%config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf
%{_sbindir}/rcsanlock
%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
%{_sbindir}/rcwdmd
@ -278,6 +281,8 @@ install -Dm 0644 src/logrotate.sanlock \
%{_includedir}/sanlock_admin.h
%{_includedir}/sanlock_resource.h
%{_includedir}/sanlock_direct.h
%{_libdir}/pkgconfig/libsanlock.pc
%{_libdir}/pkgconfig/libsanlock_client.pc
%if %{with_fence_sanlockd}
%files -n fence-sanlock

View File

@ -1,8 +1,8 @@
Index: sanlock-3.1.0/src/main.c
Index: sanlock-3.2.4/src/main.c
===================================================================
--- sanlock-3.1.0.orig/src/main.c
+++ sanlock-3.1.0/src/main.c
@@ -1913,8 +1913,8 @@
--- sanlock-3.2.4.orig/src/main.c
+++ sanlock-3.2.4/src/main.c
@@ -1920,8 +1920,8 @@ static int read_command_line(int argc, c
}
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {

View File

@ -1,8 +1,9 @@
Index: sanlock-3.1.0/init.d/sanlock.service
Index: sanlock-3.2.4/init.d/sanlock.service
===================================================================
--- sanlock-3.1.0.orig/init.d/sanlock.service
+++ sanlock-3.1.0/init.d/sanlock.service
@@ -6,8 +6,10 @@ Wants=wdmd.service
--- sanlock-3.2.4.orig/init.d/sanlock.service
+++ sanlock-3.2.4/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
[Service]
Type=forking
-ExecStart=/lib/systemd/systemd-sanlock start
@ -14,12 +15,12 @@ Index: sanlock-3.1.0/init.d/sanlock.service
[Install]
WantedBy=multi-user.target
Index: sanlock-3.1.0/init.d/wdmd.service
Index: sanlock-3.2.4/init.d/wdmd.service
===================================================================
--- sanlock-3.1.0.orig/init.d/wdmd.service
+++ sanlock-3.1.0/init.d/wdmd.service
@@ -5,8 +5,10 @@ After=syslog.target
--- sanlock-3.2.4.orig/init.d/wdmd.service
+++ sanlock-3.2.4/init.d/wdmd.service
@@ -4,8 +4,10 @@ After=syslog.target
[Service]
Type=forking
-ExecStart=/lib/systemd/systemd-wdmd start