commit sanlock for openSUSE:Factory

2020-11-02 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2020-11-02 09:37:22

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.3463 (New)


Package is "sanlock"

Mon Nov  2 09:37:22 2020 rev:26 rq:844480 version:3.8.2

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2020-08-28 
23:44:41.627512725 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.3463/sanlock.changes
2020-11-02 09:37:49.633462181 +0100
@@ -1,0 +2,6 @@
+Fri Oct 23 20:58:29 UTC 2020 - Benjamin Greiner 
+
+-  Make python subpackage ready for multiple python3 flavors
+   using the multibuild feature gh#openSUSE/python-rpm-macros#66 
+
+---

New:

  _multibuild



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.wCLZQb/_old  2020-11-02 09:37:50.529463041 +0100
+++ /var/tmp/diff_new_pack.wCLZQb/_new  2020-11-02 09:37:50.529463041 +0100
@@ -16,6 +16,18 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "python"
+%global pprefix python-
+%define oldpython python
+%bcond_without python
+%bcond_without python2
+%else
+%global pprefix %{nil}
+%bcond_with python
+%bcond_with python2
+%endif
+
 %define with_fence_sanlockd 0
 %define with_sanlk_reset0
 %if 0%{?suse_version} > 1320
@@ -26,15 +38,21 @@
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-%bcond_without python2
-Name:   sanlock
+%define pname   sanlock
+Name:   %{pprefix}%{pname}
 Version:3.8.2
 Release:0
+%if ! %{with python}
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:  System/Base
+%else
+Summary:Python bindings for the sanlock library
+License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
+Group:  System/Base
+%endif
 URL:https://pagure.io/sanlock
-Source0:%{name}-%{version}.tar.xz
+Source0:%{pname}-%{version}.tar.xz
 Source1:sysconfig.sanlock
 Source2:sysconfig.wdmd
 Source3:fence_sanlockd.init
@@ -51,6 +69,7 @@
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(uuid)
+%if ! %{with python}
 Requires(pre):  %fillup_prereq
 Requires(pre):  shadow
 Recommends: logrotate
@@ -58,11 +77,24 @@
 %if 0%{?suse_version} >= 1500
 Requires(pre):  group(disk)
 %endif
+%else
+BuildRequires:  %{pname}-devel = %{version}
+Provides:   sanlock-python
+%if "%{python_flavor}" == "python2"
+Provides:   %{oldpython}-%{pname}
+%endif
+%endif
+%python_subpackages
 
 %description
 sanlock uses disk paxos to manage leases on shared storage.
 Hosts connected to a common SAN can use this to synchronize their
 access to the shared disks.
+%if %{with python}
+This package provides a module that permits applications written in
+the Python programming language to use the interface supplied by the
+sanlock library.
+%endif
 
 %package-n libsanlock1
 Summary:A shared disk lock manager library
@@ -74,35 +106,14 @@
 Hosts connected to a common SAN can use this to synchronize their
 access to the shared disks.
 
-%package-n python2-%{name}
-Summary:Python bindings for the sanlock library
-Group:  Development/Libraries/Python
-Requires:   libsanlock1 = %{version}-%{release}
-Provides:   python-%{name}
-Provides:   sanlock-python
-
-%description-n python2-%{name}
-A module that permits applications written in the Python programming
-language to use the interface supplied by the sanlock library.
-
-%package-n python3-%{name}
-Summary:Python bindings for the sanlock library
-Group:  Development/Libraries/Python
-Requires:   libsanlock1 = %{version}-%{release}
-
-%description-n python3-%{name}
-A module that permits applications written in the Python programming
-language to use the interface supplied by the sanlock library.
-
-
-%packagedevel
-Summary:Development files for %{name}
+%package-n %{pname}-devel
+Summary:Development files for %{pname}
 Group:  Development/Libraries/C and C++
 Requires:   libsanlock1 = %{version}-%{release}
 
-%descriptiondevel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+%description-n %{pname}-devel
+The %{pname}-devel package contains libraries and header files for
+developing applications that use %{pname}.
 
 %package-n fence-sanlock
 Summary:Fence agent using sanlock and wdmd
@@ -125,33 +136,34 @@
 c

commit sanlock for openSUSE:Factory

2020-08-28 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2020-08-28 23:44:37

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.3399 (New)


Package is "sanlock"

Fri Aug 28 23:44:37 2020 rev:25 rq:828553 version:3.8.2

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2020-07-16 
12:08:26.342357255 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.3399/sanlock.changes
2020-08-28 23:44:41.627512725 +0200
@@ -1,0 +2,11 @@
+Tue Aug 18 22:48:21 UTC 2020 - James Fehlig 
+
+- Update to sanlock 3.8.2
+  - Remove extra link args
+  - Add write_init_io_timeout
+  - Disable high_priority SCHED_RR by default
+  - Dropped patches:
+sanlock-lto-disable-fpie.patch
+- Add tar_scm source service and use xz compression
+
+---

Old:

  sanlock-3.8.1.tar.gz
  sanlock-lto-disable-fpie.patch

New:

  _service
  sanlock-3.8.2.tar.xz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.a6gpvd/_old  2020-08-28 23:44:45.711510108 +0200
+++ /var/tmp/diff_new_pack.a6gpvd/_new  2020-08-28 23:44:45.711510108 +0200
@@ -28,13 +28,13 @@
 %endif
 %bcond_without python2
 Name:   sanlock
-Version:3.8.1
+Version:3.8.2
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:  System/Base
 URL:https://pagure.io/sanlock
-Source0:%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.xz
 Source1:sysconfig.sanlock
 Source2:sysconfig.wdmd
 Source3:fence_sanlockd.init
@@ -44,7 +44,6 @@
 Patch101:   sanlock-python-prefix.patch
 Patch102:   suse-systemd.patch
 Patch103:   suse-no-date-time.patch
-Patch104:   sanlock-lto-disable-fpie.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@@ -131,7 +130,6 @@
 %patch101
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 
 %build
 # upstream does not require configure

++ _service ++

  
sanlock
01b727adf1ce3c0ed5b95299d60f62bc66d98eb5
git
disable
https://pagure.io/sanlock
@PARENT_TAG@
^sanlock[-]?(.*)
\1
  
  
*.tar
xz
  
  

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.a6gpvd/_old  2020-08-28 23:44:45.775510067 +0200
+++ /var/tmp/diff_new_pack.a6gpvd/_new  2020-08-28 23:44:45.775510067 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.8.1/src/main.c
+Index: sanlock-3.8.2/src/main.c
 ===
 sanlock-3.8.1.orig/src/main.c
-+++ sanlock-3.8.1/src/main.c
+--- sanlock-3.8.2.orig/src/main.c
 sanlock-3.8.2/src/main.c
 @@ -2183,8 +2183,8 @@ static int read_command_line(int argc, c
}
  
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
  
-Index: sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.8.2/fence_sanlock/fence_sanlockd.c
 ===
 sanlock-3.8.1.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.8.2.orig/fence_sanlock/fence_sanlockd.c
 sanlock-3.8.2/fence_sanlock/fence_sanlockd.c
 @@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.a6gpvd/_old  2020-08-28 23:44:45.787510060 +0200
+++ /var/tmp/diff_new_pack.a6gpvd/_new  2020-08-28 23:44:45.787510060 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.8.1/init.d/sanlock.service
+Index: sanlock-3.8.2/init.d/sanlock.service
 ===
 sanlock-3.8.1.orig/init.d/sanlock.service
-+++ sanlock-3.8.1/init.d/sanlock.service
+--- sanlock-3.8.2.orig/init.d/sanlock.service
 sanlock-3.8.2/init.d/sanlock.service
 @@ -5,8 +5,10 @@ Wants=wdmd.service
  
  [Service]
@@ -15,10 +15,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-3.8.1/init.d/wdmd.service
+Index: sanlock-3.8.2/init.d/wdmd.service
 ===
 sanlock-3.8.1.orig/init.d/wdmd.service
-+++ sanlock-3.8.1/init.d/wdmd.service
+--- sanlock-3.8.2.orig/init.d/wdmd.service
 sanlock-3.8.2/init.d/wdmd.service
 @@ -4,8 +4,10 @@ After=syslog.target
  
  [Service]
@@ -32,10 +32,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-3.8.1/init.d/fence_sanlockd.service
+Index: sanlock-3.8.2/init.d/fence_sanlockd.service
 ===

commit sanlock for openSUSE:Factory

2020-07-16 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2020-07-16 12:08:18

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.3592 (New)


Package is "sanlock"

Thu Jul 16 12:08:18 2020 rev:24 rq:820768 version:3.8.1

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2019-08-27 
12:00:02.435662166 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.3592/sanlock.changes
2020-07-16 12:08:26.342357255 +0200
@@ -1,0 +2,9 @@
+Mon Jul 13 21:39:12 UTC 2020 - James Fehlig 
+
+- Update to sanlock 3.8.1
+  - python: add flake8 env
+  - Add client debug logging
+  _ Add per command debug logging
+  - Misc bug fixes and improvements
+
+---

Old:

  sanlock-3.8.0.tar.gz

New:

  sanlock-3.8.1.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.Nlr0qj/_old  2020-07-16 12:08:30.750361712 +0200
+++ /var/tmp/diff_new_pack.Nlr0qj/_new  2020-07-16 12:08:30.754361715 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,12 +28,12 @@
 %endif
 %bcond_without python2
 Name:   sanlock
-Version:3.8.0
+Version:3.8.1
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:  System/Base
-Url:https://pagure.io/sanlock
+URL:https://pagure.io/sanlock
 Source0:%{name}-%{version}.tar.gz
 Source1:sysconfig.sanlock
 Source2:sysconfig.wdmd

++ sanlock-3.8.0.tar.gz -> sanlock-3.8.1.tar.gz ++
 3878 lines of diff (skipped)

++ sanlock-lto-disable-fpie.patch ++
--- /var/tmp/diff_new_pack.Nlr0qj/_old  2020-07-16 12:08:30.874361837 +0200
+++ /var/tmp/diff_new_pack.Nlr0qj/_new  2020-07-16 12:08:30.874361837 +0200
@@ -1,14 +1,14 @@
 Do not mix -fPIC and -FPIE, it is causing issue in LTO mode
 (boo#1138836).
 
-diff --git a/python/setup.py b/python/setup.py
-index 91311a8..91b8b2f 100644
 a/python/setup.py
-+++ b/python/setup.py
-@@ -11,7 +11,7 @@ sanlock = Extension(name='sanlock',
- sources=['sanlock.c'],
+Index: sanlock-3.8.1/python/setup.py
+===
+--- sanlock-3.8.1.orig/python/setup.py
 sanlock-3.8.1/python/setup.py
+@@ -12,7 +12,7 @@ sanlock = Extension(name='sanlock',
  include_dirs=['../src'],
  library_dirs=['../src'],
+ extra_compile_args=["-std=c99"],
 -extra_link_args=['-fPIE', '-Wl,-z,relro,-z,now'],
 +extra_link_args=['-Wl,-z,relro,-z,now'],
  libraries=sanlocklib)

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.Nlr0qj/_old  2020-07-16 12:08:30.890361853 +0200
+++ /var/tmp/diff_new_pack.Nlr0qj/_new  2020-07-16 12:08:30.894361857 +0200
@@ -1,8 +1,8 @@
-Index: sanlock-3.8.0/src/main.c
+Index: sanlock-3.8.1/src/main.c
 ===
 sanlock-3.8.0.orig/src/main.c
-+++ sanlock-3.8.0/src/main.c
-@@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c
+--- sanlock-3.8.1.orig/src/main.c
 sanlock-3.8.1/src/main.c
+@@ -2183,8 +2183,8 @@ static int read_command_line(int argc, c
}
  
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
  
-Index: sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
 ===
 sanlock-3.8.0.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.8.1.orig/fence_sanlock/fence_sanlockd.c
 sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
 @@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.Nlr0qj/_old  2020-07-16 12:08:30.902361865 +0200
+++ /var/tmp/diff_new_pack.Nlr0qj/_new  2020-07-16 12:08:30.906361869 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.8.0/init.d/sanlock.service
+Index: sanlock-3.8.1/init.d/sanlock.service
 ===
 sanlock-3.8.0.orig/init.d/sanlock.service
-+++ sanlock-3.8.0/init.d/sanlock.ser

commit sanlock for openSUSE:Factory

2019-08-27 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2019-08-27 12:00:00

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.7948 (New)


Package is "sanlock"

Tue Aug 27 12:00:00 2019 rev:23 rq:724055 version:3.8.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2019-07-08 
15:06:32.183034542 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.7948/sanlock.changes
2019-08-27 12:00:02.435662166 +0200
@@ -0,0 +1,7 @@
+---
+Fri Aug 16 07:37:30 UTC 2019 - Dominique Leuenberger 
+
+- Addpkgconfig(uuid) BuildRequires: so far we relied on util-linux'
+  blkid to pull in uuid for us.
+
+---



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.NHhhJx/_old  2019-08-27 12:00:03.199662061 +0200
+++ /var/tmp/diff_new_pack.NHhhJx/_new  2019-08-27 12:00:03.207662060 +0200
@@ -51,6 +51,7 @@
 BuildRequires:  python-rpm-macros
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(blkid)
+BuildRequires:  pkgconfig(uuid)
 Requires(pre):  %fillup_prereq
 Requires(pre):  shadow
 Recommends: logrotate

commit sanlock for openSUSE:Factory

2019-07-08 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2019-07-08 15:06:25

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.4615 (New)


Package is "sanlock"

Mon Jul  8 15:06:25 2019 rev:22 rq:711901 version:3.8.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2019-06-20 
18:54:22.756761885 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.4615/sanlock.changes
2019-07-08 15:06:32.183034542 +0200
@@ -0,0 +1,5 @@
+Mon Jun 24 14:49:15 UTC 2019 - Martin Liška 
+
+- Add sanlock-lto-disable-fpie.patch in order to handle
+  boo#1138836. Extra -fPIE is stripped.
+

New:

  sanlock-lto-disable-fpie.patch



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.BgfuHz/_old  2019-07-08 15:06:33.423036417 +0200
+++ /var/tmp/diff_new_pack.BgfuHz/_new  2019-07-08 15:06:33.423036417 +0200
@@ -44,6 +44,7 @@
 Patch101:   sanlock-python-prefix.patch
 Patch102:   suse-systemd.patch
 Patch103:   suse-no-date-time.patch
+Patch104:   sanlock-lto-disable-fpie.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@@ -129,6 +130,7 @@
 %patch101
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 %build
 # upstream does not require configure

++ sanlock-lto-disable-fpie.patch ++
Do not mix -fPIC and -FPIE, it is causing issue in LTO mode
(boo#1138836).

diff --git a/python/setup.py b/python/setup.py
index 91311a8..91b8b2f 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -11,7 +11,7 @@ sanlock = Extension(name='sanlock',
 sources=['sanlock.c'],
 include_dirs=['../src'],
 library_dirs=['../src'],
-extra_link_args=['-fPIE', '-Wl,-z,relro,-z,now'],
+extra_link_args=['-Wl,-z,relro,-z,now'],
 libraries=sanlocklib)
 
 version = None

commit sanlock for openSUSE:Factory

2019-06-20 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2019-06-20 18:54:17

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.4811 (New)


Package is "sanlock"

Thu Jun 20 18:54:17 2019 rev:21 rq:710441 version:3.8.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2019-04-18 
13:55:03.151928572 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.4811/sanlock.changes
2019-06-20 18:54:22.756761885 +0200
@@ -1,0 +2,11 @@
+Mon Jun 17 21:45:36 UTC 2019 - Jim Fehlig 
+
+- Update to sanlock 3.8.0
+  - Add support for python 3
+  - Add support for 4k sector size
+  - More API test coverage
+  - Misc bug fixes and improvements
+  - Dropped patches:
+revert-5d535c0d-py2.patch, sanlock-python3.patch
+
+---

Old:

  revert-5d535c0d-py2.patch
  sanlock-3.7.1.tar.gz
  sanlock-python3.patch

New:

  sanlock-3.8.0.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.OhP5Oa/_old  2019-06-20 18:54:23.980763562 +0200
+++ /var/tmp/diff_new_pack.OhP5Oa/_new  2019-06-20 18:54:23.984763567 +0200
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -28,7 +28,7 @@
 %endif
 %bcond_without python2
 Name:   sanlock
-Version:3.7.1
+Version:3.8.0
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -40,12 +40,10 @@
 Source3:fence_sanlockd.init
 # Upstream patches
 # SUSE patches
-Patch100:   revert-5d535c0d-py2.patch
-Patch101:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
-Patch102:   sanlock-python-prefix.patch
-Patch103:   suse-systemd.patch
-Patch104:   suse-no-date-time.patch
-Patch105:   sanlock-python3.patch
+Patch100:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
+Patch101:   sanlock-python-prefix.patch
+Patch102:   suse-systemd.patch
+Patch103:   suse-no-date-time.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@@ -127,12 +125,10 @@
 
 %prep
 %setup -q
-%patch100 -p1
+%patch100
 %patch101
-%patch102
+%patch102 -p1
 %patch103 -p1
-%patch104 -p1
-%patch105 -p1
 
 %build
 # upstream does not require configure

++ sanlock-3.7.1.tar.gz -> sanlock-3.8.0.tar.gz ++
 4058 lines of diff (skipped)

++ sanlock-python-prefix.patch ++
--- /var/tmp/diff_new_pack.OhP5Oa/_old  2019-06-20 18:54:24.100763727 +0200
+++ /var/tmp/diff_new_pack.OhP5Oa/_new  2019-06-20 18:54:24.100763727 +0200
@@ -2,12 +2,12 @@
 ===
 --- python/Makefile.orig
 +++ python/Makefile
-@@ -11,7 +11,7 @@ inplace:
-   python setup.py build_ext --inplace
+@@ -10,7 +10,7 @@ all:
+   $(PYTHON) setup.py build $(BUILDARGS)
  
  install:
--  python setup.py install --root=$(DESTDIR)
-+  python setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
+-  $(PYTHON) setup.py install --root=$(DESTDIR)
++  $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
  
  clean:
rm -rf build

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.OhP5Oa/_old  2019-06-20 18:54:24.112763743 +0200
+++ /var/tmp/diff_new_pack.OhP5Oa/_new  2019-06-20 18:54:24.112763743 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.7.1/src/main.c
+Index: sanlock-3.8.0/src/main.c
 ===
 sanlock-3.7.1.orig/src/main.c
-+++ sanlock-3.7.1/src/main.c
+--- sanlock-3.8.0.orig/src/main.c
 sanlock-3.8.0/src/main.c
 @@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c
}
  
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
  
-Index: sanlock-3.7.1/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
 ===
 sanlock-3.7.1.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.7.1/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.8.0.orig/fence_sanlock/fence_sanlockd.c
 sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
 @@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.OhP5Oa/_old  2019-06-20 18:54:24.120763754 +0200
+++ /var/tmp/diff_new_pack.OhP5Oa/_new  2019-06-20 18:54:24.120763754

commit sanlock for openSUSE:Factory

2019-04-18 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2019-04-18 13:54:59

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.5536 (New)


Package is "sanlock"

Thu Apr 18 13:54:59 2019 rev:20 rq:694650 version:3.7.1

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2019-03-26 
15:36:15.796401246 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new.5536/sanlock.changes
2019-04-18 13:55:03.151928572 +0200
@@ -1,0 +2,6 @@
+Tue Apr  9 22:17:12 UTC 2019 - Jim Fehlig 
+
+- Update to sanlock 3.7.1
+  - Fix bugs in read_resource_owners
+
+---

Old:

  sanlock-3.7.0.tar.gz

New:

  sanlock-3.7.1.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.wPgfzS/_old  2019-04-18 13:55:03.939928827 +0200
+++ /var/tmp/diff_new_pack.wPgfzS/_new  2019-04-18 13:55:03.943928829 +0200
@@ -28,7 +28,7 @@
 %endif
 %bcond_without python2
 Name:   sanlock
-Version:3.7.0
+Version:3.7.1
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later

++ revert-5d535c0d-py2.patch ++
--- /var/tmp/diff_new_pack.wPgfzS/_old  2019-04-18 13:55:03.967928836 +0200
+++ /var/tmp/diff_new_pack.wPgfzS/_new  2019-04-18 13:55:03.967928836 +0200
@@ -7,10 +7,10 @@
 This reverts commit 5d535c0d800a84665879f6dc50c87915cf6657da. We
 don't want it on SUSE where there is no python2.
 
-Index: sanlock-3.7.0/python/Makefile
+Index: sanlock-3.7.1/python/Makefile
 ===
 sanlock-3.7.0.orig/python/Makefile
-+++ sanlock-3.7.0/python/Makefile
+--- sanlock-3.7.1.orig/python/Makefile
 sanlock-3.7.1/python/Makefile
 @@ -5,13 +5,13 @@
  # of the GNU General Public License v.2.
  

++ sanlock-3.7.0.tar.gz -> sanlock-3.7.1.tar.gz ++
 2854 lines of diff (skipped)

++ sanlock-python3.patch ++
--- /var/tmp/diff_new_pack.wPgfzS/_old  2019-04-18 13:55:04.067928869 +0200
+++ /var/tmp/diff_new_pack.wPgfzS/_new  2019-04-18 13:55:04.067928869 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.7.0/python/sanlock.c
+Index: sanlock-3.7.1/python/sanlock.c
 ===
 sanlock-3.7.0.orig/python/sanlock.c
-+++ sanlock-3.7.0/python/sanlock.c
+--- sanlock-3.7.1.orig/python/sanlock.c
 sanlock-3.7.1/python/sanlock.c
 @@ -12,6 +12,10 @@
  #include 
  #include 

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.wPgfzS/_old  2019-04-18 13:55:04.075928871 +0200
+++ /var/tmp/diff_new_pack.wPgfzS/_new  2019-04-18 13:55:04.075928871 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.7.0/src/main.c
+Index: sanlock-3.7.1/src/main.c
 ===
 sanlock-3.7.0.orig/src/main.c
-+++ sanlock-3.7.0/src/main.c
+--- sanlock-3.7.1.orig/src/main.c
 sanlock-3.7.1/src/main.c
 @@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c
}
  
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
  
-Index: sanlock-3.7.0/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.7.1/fence_sanlock/fence_sanlockd.c
 ===
 sanlock-3.7.0.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.7.0/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.7.1.orig/fence_sanlock/fence_sanlockd.c
 sanlock-3.7.1/fence_sanlock/fence_sanlockd.c
 @@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.wPgfzS/_old  2019-04-18 13:55:04.083928874 +0200
+++ /var/tmp/diff_new_pack.wPgfzS/_new  2019-04-18 13:55:04.083928874 +0200
@@ -1,7 +1,7 @@
-Index: sanlock-3.7.0/init.d/sanlock.service
+Index: sanlock-3.7.1/init.d/sanlock.service
 ===
 sanlock-3.7.0.orig/init.d/sanlock.service
-+++ sanlock-3.7.0/init.d/sanlock.service
+--- sanlock-3.7.1.orig/init.d/sanlock.service
 sanlock-3.7.1/init.d/sanlock.service
 @@ -5,8 +5,10 @@ Wants=wdmd.service
  
  [Service]
@@ -15,10 +15,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-3.7.0/init.d/wdmd.service
+Index: sanlock-3.7.1/init.d/wdmd.service
 ===
 sanlock-3.7.0.orig/init.d/wdmd.service
-+++ sanlock-3.7.0/init.d/wdmd.service
+--- sanlock-3.7.1.orig/init.d/wdmd.service
 sanlock-3.7.1/init.d/wdmd.service
 @@ -4,8 +4,10 @@ After=syslog.target
  
  [Service]
@@ -

commit sanlock for openSUSE:Factory

2019-03-26 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2019-03-26 15:36:13

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new.25356 (New)


Package is "sanlock"

Tue Mar 26 15:36:13 2019 rev:19 rq:687477 version:3.7.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2018-03-30 
11:59:32.810821312 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.25356/sanlock.changes   
2019-03-26 15:36:15.796401246 +0100
@@ -1,0 +2,13 @@
+Thu Mar 21 20:27:25 UTC 2019 - Jim Fehlig 
+
+- Update to sanlock 3.7.0
+  - Allow setting max_sectors_kb
+  - Configurable sector size and align size
+  - Support SANLOCK_RUN_DIR and SANLOCK_PRIVILEGED environment
+variables
+  - Revert upstream commit forcing use of python2
+revert-5d535c0d-py2.patch
+  - Dropped patches:
+sanlock-old_blkid.patch, suse-fix-link-errors.patch
+
+---

Old:

  sanlock-3.6.0.tar.gz
  sanlock-old_blkid.patch
  suse-fix-link-errors.patch

New:

  revert-5d535c0d-py2.patch
  sanlock-3.7.0.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.Mja3c1/_old  2019-03-26 15:36:16.740400850 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new  2019-03-26 15:36:16.740400850 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -28,7 +28,7 @@
 %endif
 %bcond_without python2
 Name:   sanlock
-Version:3.6.0
+Version:3.7.0
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -40,14 +40,12 @@
 Source3:fence_sanlockd.init
 # Upstream patches
 # SUSE patches
-Patch100:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
-Patch101:   sanlock-python-prefix.patch
-Patch102:   sanlock-old_blkid.patch
+Patch100:   revert-5d535c0d-py2.patch
+Patch101:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
+Patch102:   sanlock-python-prefix.patch
 Patch103:   suse-systemd.patch
 Patch104:   suse-no-date-time.patch
-# bsc#1030060
-Patch105:   suse-fix-link-errors.patch
-Patch106:   sanlock-python3.patch
+Patch105:   sanlock-python3.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@@ -129,13 +127,12 @@
 
 %prep
 %setup -q
-%patch100
+%patch100 -p1
 %patch101
 %patch102
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
-%patch106 -p1
 
 %build
 # upstream does not require configure

++ revert-5d535c0d-py2.patch ++
commit d4fc2914b1847202d9dc26df89954766b27921d6
Author: Jim Fehlig 
Date:   Thu Mar 21 11:20:29 2019 -0600

Revert "python: Fix build on Fedora 29"

This reverts commit 5d535c0d800a84665879f6dc50c87915cf6657da. We
don't want it on SUSE where there is no python2.

Index: sanlock-3.7.0/python/Makefile
===
--- sanlock-3.7.0.orig/python/Makefile
+++ sanlock-3.7.0/python/Makefile
@@ -5,13 +5,13 @@
 # of the GNU General Public License v.2.
 
 all:
-   python2 setup.py build
+   python setup.py build
 
 inplace:
-   python2 setup.py build_ext --inplace
+   python setup.py build_ext --inplace
 
 install:
-   python2 setup.py install --root=$(DESTDIR)
+   python setup.py install --root=$(DESTDIR)
 
 clean:
rm -rf build
++ sanlock-3.6.0.tar.gz -> sanlock-3.7.0.tar.gz ++
 9964 lines of diff (skipped)

++ sanlock-python-prefix.patch ++
--- /var/tmp/diff_new_pack.Mja3c1/_old  2019-03-26 15:36:16.872400795 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new  2019-03-26 15:36:16.872400795 +0100
@@ -2,8 +2,8 @@
 ===
 --- python/Makefile.orig
 +++ python/Makefile
-@@ -8,7 +8,7 @@ all:
-   python setup.py build
+@@ -11,7 +11,7 @@ inplace:
+   python setup.py build_ext --inplace
  
  install:
 -  python setup.py install --root=$(DESTDIR)

++ sanlock-python3.patch ++
--- /var/tmp/diff_new_pack.Mja3c1/_old  2019-03-26 15:36:16.884400790 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new  2019-03-26 15:36:16.884400790 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.6.0/python/sanlock.c
+Index: sanlock-3.7.0/python/sanlock.c
 ===
 sanlock-3.6.0.orig/python/sanlock.c
-+++ sanlock-3.6.0/python/sanlock.c

commit sanlock for openSUSE:Factory

2018-03-30 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2018-03-30 11:59:27

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Fri Mar 30 11:59:27 2018 rev:18 rq:591650 version:3.6.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2017-12-12 
21:16:57.451841183 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2018-03-30 
11:59:32.810821312 +0200
@@ -1,0 +2,22 @@
+Mon Mar 26 16:36:05 UTC 2018 - jfeh...@suse.com
+
+- Fix module initialization to work with both python2 and python3
+  Updated sanlock-python3.patch
+  bsc#1076414
+
+---
+Wed Mar 21 12:58:08 UTC 2018 - tchva...@suse.com
+
+- Add code to build with both python2 and python3 bindings with
+  provided condition so we can later on optionalize python2 builds
+  sanlock-python3.patch
+  bsc#1076414
+
+---
+Wed Mar 21 12:44:29 UTC 2018 - tchva...@suse.com
+
+- Cleanup with spec-cleaner (only support SLE12 and newer)
+- Add -fno-strict-aliasing to python subpkg
+- Create rcsanlk-resetd link for the service control
+
+---

New:

  sanlock-python3.patch



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.VsLmAn/_old  2018-03-30 11:59:33.538794986 +0200
+++ /var/tmp/diff_new_pack.VsLmAn/_new  2018-03-30 11:59:33.542794842 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,43 +16,24 @@
 #
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
-%endif
-
 %define with_fence_sanlockd 0
 %define with_sanlk_reset0
-
 %if 0%{?suse_version} > 1320
 %define with_fence_sanlockd 1
 %define with_sanlk_reset1
 %endif
-
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
+%bcond_without python2
 Name:   sanlock
 Version:3.6.0
 Release:0
 Summary:A shared disk lock manager
-License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
+License:GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:  System/Base
-
 Url:https://pagure.io/sanlock
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libaio-devel
-BuildRequires:  libblkid-devel
-BuildRequires:  python
-BuildRequires:  python-devel
-BuildRequires:  systemd
-%{?systemd_requires}
-BuildRequires:  xz
-Requires(pre):  %fillup_prereq
-%if 0%{?suse_version} > 1320
-Requires(pre):  group(disk)
-%endif
-Requires(pre):  %{_sbindir}/groupadd
-Requires(pre):  %{_sbindir}/useradd
-Requires:   %{name}-lib = %{version}-%{release}
-Recommends: logrotate
 Source0:%{name}-%{version}.tar.gz
 Source1:sysconfig.sanlock
 Source2:sysconfig.wdmd
@@ -66,8 +47,20 @@
 Patch104:   suse-no-date-time.patch
 # bsc#1030060
 Patch105:   suse-fix-link-errors.patch
-
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+Patch106:   sanlock-python3.patch
+BuildRequires:  %{python_module devel}
+BuildRequires:  libaio-devel
+BuildRequires:  pkgconfig
+BuildRequires:  python-rpm-macros
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(blkid)
+Requires(pre):  %fillup_prereq
+Requires(pre):  shadow
+Recommends: logrotate
+%{?systemd_requires}
+%if 0%{?suse_version} >= 1500
+Requires(pre):  group(disk)
+%endif
 
 %description
 sanlock uses disk paxos to manage leases on shared storage.
@@ -75,25 +68,36 @@
 access to the shared disks.
 
 %package-n libsanlock1
-Provides:   sanlock-lib
 Summary:A shared disk lock manager library
 Group:  Development/Libraries/C and C++
+Provides:   sanlock-lib = %{version}
 
 %description-n libsanlock1
 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.
 
-%package-n python-%name
+%package-n python2-%{name}
+Summary:Python bindings for the sanlock library
+Group:  Development/Libraries/Python
+Requires:   libsanlock1 =

commit sanlock for openSUSE:Factory

2017-12-12 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2017-12-12 21:16:54

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Tue Dec 12 21:16:54 2017 rev:17 rq:554610 version:3.6.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2017-11-30 
12:40:42.504134159 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-12-12 
21:16:57.451841183 +0100
@@ -1,0 +2,10 @@
+Tue Dec  5 18:53:41 UTC 2017 - jfeh...@suse.com
+
+- Update to sanlock 3.6.0
+  - preserve dblock values when setting shared flag
+  - fix detection of shared lease
+  - fix release interference with paxos
+  - retry ballot when new lver is seen
+  - add a NOWAIT flag for convert
+
+---

Old:

  sanlock-3.5.0.tar.gz

New:

  sanlock-3.6.0.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.QmZiLX/_old  2017-12-12 21:16:58.835774374 +0100
+++ /var/tmp/diff_new_pack.QmZiLX/_new  2017-12-12 21:16:58.839774181 +0100
@@ -30,7 +30,7 @@
 %endif
 
 Name:   sanlock
-Version:3.5.0
+Version:3.6.0
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+

++ sanlock-3.5.0.tar.gz -> sanlock-3.6.0.tar.gz ++
 1626 lines of diff (skipped)

++ suse-fix-link-errors.patch ++
--- /var/tmp/diff_new_pack.QmZiLX/_old  2017-12-12 21:16:58.991766844 +0100
+++ /var/tmp/diff_new_pack.QmZiLX/_new  2017-12-12 21:16:58.995766651 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.5.0/fence_sanlock/Makefile
+Index: sanlock-3.6.0/fence_sanlock/Makefile
 ===
 sanlock-3.5.0.orig/fence_sanlock/Makefile
-+++ sanlock-3.5.0/fence_sanlock/Makefile
+--- sanlock-3.6.0.orig/fence_sanlock/Makefile
 sanlock-3.6.0/fence_sanlock/Makefile
 @@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src
  CFLAGS += -fPIE -DPIE
  
@@ -11,10 +11,10 @@
  
  all: $(TARGET1) $(TARGET2)
  
-Index: sanlock-3.5.0/src/Makefile
+Index: sanlock-3.6.0/src/Makefile
 ===
 sanlock-3.5.0.orig/src/Makefile
-+++ sanlock-3.5.0/src/Makefile
+--- sanlock-3.6.0.orig/src/Makefile
 sanlock-3.6.0/src/Makefile
 @@ -96,17 +96,16 @@ CFLAGS += -DVERSION=\"$(VER)\"
  CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE
  
@@ -37,10 +37,10 @@
ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so
ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR)
  
-Index: sanlock-3.5.0/tests/Makefile
+Index: sanlock-3.6.0/tests/Makefile
 ===
 sanlock-3.5.0.orig/tests/Makefile
-+++ sanlock-3.5.0/tests/Makefile
+--- sanlock-3.6.0.orig/tests/Makefile
 sanlock-3.6.0/tests/Makefile
 @@ -34,7 +34,7 @@ CFLAGS += -D_GNU_SOURCE -g \
-fasynchronous-unwind-tables \
-fdiagnostics-show-option
@@ -50,10 +50,10 @@
  
  all: $(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6) 
$(TARGET7)
  
-Index: sanlock-3.5.0/reset/Makefile
+Index: sanlock-3.6.0/reset/Makefile
 ===
 sanlock-3.5.0.orig/reset/Makefile
-+++ sanlock-3.5.0/reset/Makefile
+--- sanlock-3.6.0.orig/reset/Makefile
 sanlock-3.6.0/reset/Makefile
 @@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src
  CFLAGS += -fPIE -DPIE
  

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.QmZiLX/_old  2017-12-12 21:16:59.003766265 +0100
+++ /var/tmp/diff_new_pack.QmZiLX/_new  2017-12-12 21:16:59.007766072 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.5.0/src/main.c
+Index: sanlock-3.6.0/src/main.c
 ===
 sanlock-3.5.0.orig/src/main.c
-+++ sanlock-3.5.0/src/main.c
+--- sanlock-3.6.0.orig/src/main.c
 sanlock-3.6.0/src/main.c
 @@ -1904,8 +1904,8 @@ static int read_command_line(int argc, c
}
  
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
  
-Index: sanlock-3.5.0/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.6.0/fence_sanlock/fence_sanlockd.c
 ===
 sanlock-3.5.0.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.5.0/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.6.0.orig/fence_sanlock/fence_sanlockd.c
 sanlock-3.6.0/fence_sanlock/fence_sanlockd.c
 @@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

++ suse-systemd.patch ++
--- /var/tmp/diff

commit sanlock for openSUSE:Factory

2017-11-30 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2017-11-30 12:40:42

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Thu Nov 30 12:40:42 2017 rev:16 rq:545093 version:3.5.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2017-06-17 
10:20:35.248080136 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-11-30 
12:40:42.504134159 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:47:59 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.YhuDud/_old  2017-11-30 12:40:43.360103036 +0100
+++ /var/tmp/diff_new_pack.YhuDud/_new  2017-11-30 12:40:43.364102890 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define with_fence_sanlockd 0
 %define with_sanlk_reset0
 
@@ -162,8 +167,8 @@
 %endif
 
 install -D -m 644 src/sanlock.conf 
%{buildroot}/%{_sysconfdir}/sanlock/sanlock.conf
-install -D -m 644 %SOURCE1 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
-install -D -m 644 %SOURCE2 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
+install -D -m 644 %SOURCE1 %{buildroot}/%{_fillupdir}/sysconfig.sanlock
+install -D -m 644 %SOURCE2 %{buildroot}/%{_fillupdir}/sysconfig.wdmd
 
 install -D -m 644 init.d/sanlock.service 
%{buildroot}/%{_unitdir}/sanlock.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsanlock
@@ -246,9 +251,9 @@
 %dir %attr(0700, root, root) %{_sysconfdir}/sanlock/
 %config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf
 %{_sbindir}/rcsanlock
-%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
+%{_fillupdir}/sysconfig.sanlock
 %{_sbindir}/rcwdmd
-%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
+%{_fillupdir}/sysconfig.wdmd
 %{_unitdir}/sanlock.service
 %{_unitdir}/wdmd.service
 %{_sbindir}/sanlock

commit sanlock for openSUSE:Factory

2017-06-17 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2017-06-17 10:20:31

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Sat Jun 17 10:20:31 2017 rev:15 rq:501828 version:3.5.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2017-04-17 
10:22:24.399392465 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-06-17 
10:20:35.248080136 +0200
@@ -1,0 +2,9 @@
+Wed Jun  7 22:39:48 UTC 2017 - jfeh...@suse.com
+
+- Update to sanlock 3.5.0
+  - increase open file limit to 2048
+  - add option to log UTC timestamps
+  - doc improvements
+- Remove support for old, non-systemd distros
+
+---

Old:

  sanlock-3.4.0.tar.xz
  sanlock.init
  wdmd.init

New:

  sanlock-3.5.0.tar.gz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.EGvxBT/_old  2017-06-17 10:20:36.043967865 +0200
+++ /var/tmp/diff_new_pack.EGvxBT/_new  2017-06-17 10:20:36.047967301 +0200
@@ -16,21 +16,16 @@
 #
 
 
-%define with_systemd0
 %define with_fence_sanlockd 0
 %define with_sanlk_reset0
 
-%if 0%{?suse_version} > 1140
-%define with_systemd1
-%endif
-
 %if 0%{?suse_version} > 1320
 %define with_fence_sanlockd 1
 %define with_sanlk_reset1
 %endif
 
 Name:   sanlock
-Version:3.4.0
+Version:3.5.0
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
@@ -42,12 +37,8 @@
 BuildRequires:  libblkid-devel
 BuildRequires:  python
 BuildRequires:  python-devel
-%if %{with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
-%else
-Requires(pre):  %insserv_prereq
-%endif
 BuildRequires:  xz
 Requires(pre):  %fillup_prereq
 %if 0%{?suse_version} > 1320
@@ -57,12 +48,10 @@
 Requires(pre):  %{_sbindir}/useradd
 Requires:   %{name}-lib = %{version}-%{release}
 Recommends: logrotate
-Source0:%{name}-%{version}.tar.xz
-Source1:sanlock.init
-Source2:sysconfig.sanlock
-Source3:wdmd.init
-Source4:sysconfig.wdmd
-Source5:fence_sanlockd.init
+Source0:%{name}-%{version}.tar.gz
+Source1:sysconfig.sanlock
+Source2:sysconfig.wdmd
+Source3:fence_sanlockd.init
 # Upstream patches
 # SUSE patches
 Patch100:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
@@ -134,9 +123,7 @@
 %patch100
 %patch101
 %patch102
-%if %{with_systemd}
 %patch103 -p1
-%endif
 %patch104 -p1
 %patch105 -p1
 
@@ -175,32 +162,21 @@
 %endif
 
 install -D -m 644 src/sanlock.conf 
%{buildroot}/%{_sysconfdir}/sanlock/sanlock.conf
-install -D -m 644 %SOURCE2 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
-install -D -m 644 %SOURCE4 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
+install -D -m 644 %SOURCE1 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
+install -D -m 644 %SOURCE2 
%{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
 
-%if %{with_systemd}
 install -D -m 644 init.d/sanlock.service 
%{buildroot}/%{_unitdir}/sanlock.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsanlock
 install -D -m 644 init.d/wdmd.service %{buildroot}/%{_unitdir}/wdmd.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcwdmd
 %if %{with_fence_sanlockd}
-install -D -m 0755 %SOURCE5 %{buildroot}/usr/lib/systemd/systemd-fence_sanlockd
+install -D -m 0755 %SOURCE3 %{buildroot}/usr/lib/systemd/systemd-fence_sanlockd
 install -D -m 0644 init.d/fence_sanlockd.service 
%{buildroot}/%{_unitdir}/fence_sanlockd.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcfence_sanlockd
 %endif
 %if %{with_sanlk_reset}
 install -D -m 0644 init.d/sanlk-resetd.service 
%{buildroot}/%{_unitdir}/sanlk-resetd.service
 %endif
-%else
-install -D -m 755 %SOURCE1 %{buildroot}/etc/init.d/sanlock
-ln -s /etc/init.d/sanlock %{buildroot}%{_sbindir}/rcsanlock
-install -D -m 755 %SOURCE3 %{buildroot}/etc/init.d/wdmd
-ln -s /etc/init.d/wdmd %{buildroot}%{_sbindir}/rcwdmd
-%if %{with_fence_sanlockd}
-install -D -m 755 %SOURCE5 %{buildroot}/%{_initddir}/fence_sanlockd
-ln -s /etc/init.d/fence_sanlockd %{buildroot}%{_sbindir}/rcfence_sanlockd
-%endif
-%endif
 
 install -Dm 0644 src/logrotate.sanlock \
%{buildroot}/etc/logrotate.d/sanlock
@@ -214,28 +190,17 @@
-u 179 -c "sanlock" -s /sbin/nologin -r \
-g 179 -G disk -d /var/run/sanlock sanlock
 
-%if %{with_systemd}
 %service_add_pre wdmd.service
 %service_add_pre sanlock.service
-%endif
 
 %pre -n fence-sanlock
-%if %{with_systemd}
 %service_add_pre fence_sanlockd.service
-%endif
 
 %p

commit sanlock for openSUSE:Factory

2017-04-17 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2017-04-17 10:22:23

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Mon Apr 17 10:22:23 2017 rev:14 rq:487143 version:3.4.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2017-03-29 
13:21:49.547750655 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-04-17 
10:22:24.399392465 +0200
@@ -1,0 +2,28 @@
+Fri Apr  7 21:53:33 UTC 2017 - jeng...@inai.de
+
+- Remove redundant %if guards around %package and scriptlets.
+  They are only really needed for %files.
+- Replace $RPM_ shell vars by modern macros.
+- Trim descriptions a little.
+
+---
+Mon Apr  3 15:43:17 UTC 2017 - jfeh...@suse.com
+
+- spec: fix permissions on config files
+
+---
+Mon Apr  3 15:31:43 UTC 2017 - jfeh...@suse.com
+
+- Use System/Base in fence and reset subpackages
+
+---
+Mon Apr  3 07:21:10 UTC 2017 - mplus...@suse.com
+
+- Use correct permissions on unit files (bsc#1032046)
+
+---
+Wed Mar 29 10:49:35 UTC 2017 - meiss...@suse.com
+
+- prerequire groupadd and useradd.
+
+---



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.8o134Z/_old  2017-04-17 10:22:26.343117190 +0200
+++ /var/tmp/diff_new_pack.8o134Z/_new  2017-04-17 10:22:26.347116625 +0200
@@ -53,6 +53,8 @@
 %if 0%{?suse_version} > 1320
 Requires(pre):  group(disk)
 %endif
+Requires(pre):  %{_sbindir}/groupadd
+Requires(pre):  %{_sbindir}/useradd
 Requires:   %{name}-lib = %{version}-%{release}
 Recommends: logrotate
 Source0:%{name}-%{version}.tar.xz
@@ -84,8 +86,7 @@
 Group:  Development/Libraries/C and C++
 
 %description-n libsanlock1
-The %{name}-lib package contains the runtime libraries for sanlock,
-a shared disk lock manager.
+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.
 
@@ -96,9 +97,8 @@
 Requires:   libsanlock1 = %{version}-%{release}
 
 %description-n python-%name
-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.
+A module that permits applications written in the Python programming
+language to use the interface supplied by the sanlock library.
 
 %packagedevel
 Summary:Development files for %{name}
@@ -109,30 +109,25 @@
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%if %{with_fence_sanlockd}
 %package-n fence-sanlock
 Summary:Fence agent using sanlock and wdmd
-Group:  System Environment/Base
+Group:  System/Base
 Requires:   sanlock = %{version}-%{release}
 
 %description-n fence-sanlock
-The fence-sanlock package contains the fence agent and
-daemon for using sanlock and wdmd as a cluster fence agent.
-%endif
+Fence agent and daemon for using sanlock and wdmd as a cluster fence agent.
 
-%if %{with_sanlk_reset}
 %package -n sanlk-reset
 Summary:Host reset daemon and client using sanlock
-Group:  System Environment/Base
+Group:  System/Base
 Requires:   libsanlock1 = %{version}-%{release}
 Requires:   sanlock = %{version}-%{release}
 
 %description -n sanlk-reset
-The sanlk-reset package contains the reset daemon and client.
+The reset daemon and client for sanlock.
 A cooperating host running the daemon can be reset by a host
 running the client, so long as both maintain access to a
 common sanlock lockspace.
-%endif
 
 %prep
 %setup -q
@@ -148,69 +143,69 @@
 %build
 # upstream does not require configure
 # 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
+CFLAGS="%{optflags}" make -C wdmd
+CFLAGS="%{optflags}" make -C src
+CFLAGS="%{optflags}" make -C python
 %if %{with_fence_sanlockd}
-CFLAGS=$RPM_OPT_FLAGS make -C fence_sanlock
+CFLAGS="%{optflags}" make -C fence_sanlock
 %endif
 %if %{with_sanlk_reset}
-CFLAGS=$RPM_OPT_FLAGS make -C reset
+CFLAGS="%{optflags}" make -C reset
 %endif
 
 %install
 make -C src \
 install LIBDIR=%{_libdir} \
-DESTDIR=$RPM_BUILD_ROOT
+DESTDIR="%{buildroot}"
 make -C wdmd \
 ins

commit sanlock for openSUSE:Factory

2017-03-29 Thread root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2017-03-29 13:21:47

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Wed Mar 29 13:21:47 2017 rev:13 rq:482340 version:3.4.0

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2015-06-30 
10:17:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-03-29 
13:21:49.547750655 +0200
@@ -1,0 +2,19 @@
+Wed Mar 15 08:23:44 UTC 2017 - z...@suse.com
+
+- Update to sanlock 3.4.0
+- Enable fence_sanlockd so that lvm2 can use the new lvmlocked
+  feature in cluster environment
+  * fix unpackaged file - /usr/sbin/rcfence_sanlockd
+  * refresh suse-no-date-time.patch to cover the same issue
+in fence_sanlockd
+  * adjust fence_sanlockd.init and suse-systemd.patch
+- Enable sanlk-reset subpackage 
+- Fix "undefined symbol to io_suspend" at runtime, bsc#1030060
+  suse-fix-link-errors.patch
+
+---
+Sat Mar 11 08:40:02 UTC 2017 - ku...@suse.com
+
+- Add group disk as Prerequires
+
+---

Old:

  sanlock-3.2.4.tar.xz

New:

  sanlock-3.4.0.tar.xz
  suse-fix-link-errors.patch



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.ViNSv2/_old  2017-03-29 13:21:50.683590021 +0200
+++ /var/tmp/diff_new_pack.ViNSv2/_new  2017-03-29 13:21:50.687589455 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -18,19 +18,25 @@
 
 %define with_systemd0
 %define with_fence_sanlockd 0
+%define with_sanlk_reset0
 
 %if 0%{?suse_version} > 1140
 %define with_systemd1
 %endif
 
+%if 0%{?suse_version} > 1320
+%define with_fence_sanlockd 1
+%define with_sanlk_reset1
+%endif
+
 Name:   sanlock
-Version:3.2.4
+Version:3.4.0
 Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
 Group:  System/Base
 
-Url:https://fedorahosted.org/sanlock/
+Url:https://pagure.io/sanlock
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libaio-devel
 BuildRequires:  libblkid-devel
@@ -44,9 +50,12 @@
 %endif
 BuildRequires:  xz
 Requires(pre):  %fillup_prereq
+%if 0%{?suse_version} > 1320
+Requires(pre):  group(disk)
+%endif
 Requires:   %{name}-lib = %{version}-%{release}
 Recommends: logrotate
-Source0:
https://git.fedorahosted.org/cgit/sanlock.git/snapshot/%{name}-%{version}.tar.xz
+Source0:%{name}-%{version}.tar.xz
 Source1:sanlock.init
 Source2:sysconfig.sanlock
 Source3:wdmd.init
@@ -59,6 +68,8 @@
 Patch102:   sanlock-old_blkid.patch
 Patch103:   suse-systemd.patch
 Patch104:   suse-no-date-time.patch
+# bsc#1030060
+Patch105:   suse-fix-link-errors.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -109,6 +120,20 @@
 daemon for using sanlock and wdmd as a cluster fence agent.
 %endif
 
+%if %{with_sanlk_reset}
+%package -n sanlk-reset
+Summary:Host reset daemon and client using sanlock
+Group:  System Environment/Base
+Requires:   libsanlock1 = %{version}-%{release}
+Requires:   sanlock = %{version}-%{release}
+
+%description -n sanlk-reset
+The sanlk-reset package contains the reset daemon and client.
+A cooperating host running the daemon can be reset by a host
+running the client, so long as both maintain access to a
+common sanlock lockspace.
+%endif
+
 %prep
 %setup -q
 %patch100
@@ -118,6 +143,7 @@
 %patch103 -p1
 %endif
 %patch104 -p1
+%patch105 -p1
 
 %build
 # upstream does not require configure
@@ -128,6 +154,9 @@
 %if %{with_fence_sanlockd}
 CFLAGS=$RPM_OPT_FLAGS make -C fence_sanlock
 %endif
+%if %{with_sanlk_reset}
+CFLAGS=$RPM_OPT_FLAGS make -C reset
+%endif
 
 %install
 make -C src \
@@ -144,19 +173,29 @@
 install LIBDIR=%{_libdir} \
 DESTDIR=$RPM_BUILD_ROOT
 %endif
+%if %{with_sanlk_reset}
+make -C reset \
+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

commit sanlock for openSUSE:Factory

2015-06-30 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2015-06-30 10:17:10

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2015-03-27 
09:40:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2015-06-30 
10:17:12.0 +0200
@@ -1,0 +2,9 @@
+Fri Jun 19 10:48:55 MDT 2015 - jfeh...@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/
+
+---

Old:

  sanlock-3.2.2.tar.xz

New:

  sanlock-3.2.4.tar.xz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.orsgFy/_old  2015-06-30 10:17:13.0 +0200
+++ /var/tmp/diff_new_pack.orsgFy/_new  2015-06-30 10:17:13.0 +0200
@@ -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 @@
 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 @@
 
 %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 @@
 %{_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

++ sanlock-3.2.2.tar.xz -> sanlock-3.2.4.tar.xz ++
 2588 lines of diff (skipped)

++ sanlock-SCHED_RESET_ON_FORK-undefined.patch ++
--- /var/tmp/diff_new_pack.orsgFy/_old  2015-06-30 10:17:13.0 +0200
+++ /var/tmp/diff_new_pack.orsgFy/_new  2015-06-30 10:17:13.0 +0200
@@ -2,7 +2,7 @@
 ===
 --- src/main.c.orig
 +++ src/main.c
-@@ -58,6 +58,10 @@
+@@ -59,6 +59,10 @@
  
  #define SIGRUNPATH 100 /* anything that's not SIGTERM/SIGKILL */
  

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.orsgFy/_old  2015-06-30 10:17:13.0 +0200
+++ /var/tmp/diff_new_pack.orsgFy/_new  2015-06-30 10:17:13.0 +0200
@@ -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")) {

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.orsgFy/_old  2015-06-30 10:17:13.0 +0200
+++ /var/tmp/diff_new_pack.orsgFy/_new  2015-06-30 10:17:13.0 +0200
@@ -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 @@
  
  [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
+-

commit sanlock for openSUSE:Factory

2015-03-27 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2015-03-27 09:40:07

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2014-01-14 
15:12:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2015-03-27 
09:40:08.0 +0100
@@ -1,0 +2,18 @@
+Sat Mar 21 16:26:54 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 3.2.2
+  * reset: native timeout
+  * reset: Reduce logging noise to stderr and syslog
+  * sanlock, reset: coverity fixes
+- Refactor specfile to be policy compliant
+- Use download Url as source
+- Add xz build requires; needed as the source tarball is compressed
+  with xz
+- Do not provide both systemd and sysvinit support on a same system;
+  it's redundant
+- Add systemd backward compatibility links
+- Update patchs:
+  * suse-no-date-time.patch 
+  * suse-systemd.patch 
+
+---

Old:

  sanlock-3.1.0.tar.bz2

New:

  sanlock-3.2.2.tar.xz



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.Qqh9Dt/_old  2015-03-27 09:40:08.0 +0100
+++ /var/tmp/diff_new_pack.Qqh9Dt/_new  2015-03-27 09:40:08.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products 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,8 +24,8 @@
 %endif
 
 Name:   sanlock
-Version:3.1.0
-Release:1%{?dist}
+Version:3.2.2
+Release:0
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
 Group:  System/Base
@@ -39,13 +39,14 @@
 %if %{with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
+%else
+Requires(pre):  %insserv_prereq
 %endif
-Requires(pre):  %insserv_prereq %fillup_prereq
+BuildRequires:  xz
+Requires(pre):  %fillup_prereq
 Requires:   %{name}-lib = %{version}-%{release}
 Recommends: logrotate
-# Latest version available at
-# https://fedorahosted.org/releases/s/a/sanlock/
-Source0:%{name}-%{version}.tar.bz2
+Source0:
https://git.fedorahosted.org/cgit/sanlock.git/snapshot/%{name}-%{version}.tar.xz
 Source1:sanlock.init
 Source2:sysconfig.sanlock
 Source3:wdmd.init
@@ -66,12 +67,56 @@
 Hosts connected to a common SAN can use this to synchronize their
 access to the shared disks.
 
+%package-n libsanlock1
+Provides:   sanlock-lib
+Summary:A shared disk lock manager library
+Group:  Development/Libraries/C and C++
+
+%description-n libsanlock1
+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.
+
+%package-n python-%name
+Provides:   sanlock-python
+Summary:Python bindings for the sanlock library
+Group:  Development/Libraries/Python
+Requires:   libsanlock1 = %{version}-%{release}
+
+%description-n python-%name
+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.
+
+%packagedevel
+Summary:Development files for %{name}
+Group:  Development/Libraries/C and C++
+Requires:   libsanlock1 = %{version}-%{release}
+
+%descriptiondevel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%if %{with_fence_sanlockd}
+%package-n fence-sanlock
+Summary:Fence agent using sanlock and wdmd
+Group:  System Environment/Base
+Requires:   sanlock = %{version}-%{release}
+
+%description-n fence-sanlock
+The fence-sanlock package contains the fence agent and
+daemon for using sanlock and wdmd as a cluster fence agent.
+%endif
+
 %prep
 %setup -q
 %patch100
 %patch101
 %patch102
+%if %{with_systemd}
 %patch103 -p1
+%endif
 %patch104 -p1
 
 %build
@@ -99,31 +144,32 @@
 install LIBDIR=%{_libdir} \
 DESTDIR=$RPM_BUILD_ROOT
 %endif
-install -D -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/sanlock
-ln -s /etc/init.d/sanlock $RPM_BUILD_ROOT%{_sbindir}/rcsanlock
 install -D -m 755 %SOURCE2 
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
-install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/wdmd
-ln -s /etc

commit sanlock for openSUSE:Factory

2014-01-14 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2014-01-14 15:12:44

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2013-08-12 
14:26:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2014-01-14 
15:12:46.0 +0100
@@ -1,0 +2,10 @@
+Fri Jan 10 10:16:16 MST 2014 - jfeh...@suse.com
+
+- Update to sanlock 3.1.0
+  - fix debug status for add/rem lockspace
+  - add_lockspace error for conflicting lockspace definitions
+  - transient timeout handling in acquire and release
+  - allow more than 8 resources per client
+  - fix spaces in path names
+
+---

Old:

  sanlock-3.0.1.tar.bz2

New:

  sanlock-3.1.0.tar.bz2



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.PQiUtY/_old  2014-01-14 15:12:47.0 +0100
+++ /var/tmp/diff_new_pack.PQiUtY/_new  2014-01-14 15:12:47.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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.0.1
+Version:3.1.0
 Release:1%{?dist}
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+

++ sanlock-3.0.1.tar.bz2 -> sanlock-3.1.0.tar.bz2 ++
 2924 lines of diff (skipped)

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.PQiUtY/_old  2014-01-14 15:12:47.0 +0100
+++ /var/tmp/diff_new_pack.PQiUtY/_new  2014-01-14 15:12:47.0 +0100
@@ -1,8 +1,8 @@
-Index: sanlock-3.0.1/src/main.c
+Index: sanlock-3.1.0/src/main.c
 ===
 sanlock-3.0.1.orig/src/main.c
-+++ sanlock-3.0.1/src/main.c
-@@ -1863,8 +1863,8 @@ static int read_command_line(int argc, c
+--- sanlock-3.1.0.orig/src/main.c
 sanlock-3.1.0/src/main.c
+@@ -1870,8 +1870,8 @@ static int read_command_line(int argc, c
  
if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
!strcmp(arg1, "-V")) {

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.PQiUtY/_old  2014-01-14 15:12:47.0 +0100
+++ /var/tmp/diff_new_pack.PQiUtY/_new  2014-01-14 15:12:47.0 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.0.1/init.d/sanlock.service
+Index: sanlock-3.1.0/init.d/sanlock.service
 ===
 sanlock-3.0.1.orig/init.d/sanlock.service
-+++ sanlock-3.0.1/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
  [Service]
  Type=forking
@@ -15,10 +15,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-3.0.1/init.d/wdmd.service
+Index: sanlock-3.1.0/init.d/wdmd.service
 ===
 sanlock-3.0.1.orig/init.d/wdmd.service
-+++ sanlock-3.0.1/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
  [Service]
  Type=forking

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit sanlock for openSUSE:Factory

2013-08-12 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2013-08-12 14:26:14

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2013-03-03 
21:08:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2013-08-12 
14:26:16.0 +0200
@@ -1,0 +2,8 @@
+Thu Aug  1 16:42:24 MDT 2013 - jfeh...@suse.com
+
+- Update to sanlock 3.0.1
+  - Add lvb feature
+  - Various bug fixes and improvements
+  - Drop upstream patch 0001-fix-systemd-service-files.patch
+
+---

Old:

  0001-fix-systemd-service-files.patch
  sanlock-2.6.tar.bz2

New:

  sanlock-3.0.1.tar.bz2



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.2BFocw/_old  2013-08-12 14:26:17.0 +0200
+++ /var/tmp/diff_new_pack.2BFocw/_new  2013-08-12 14:26:17.0 +0200
@@ -24,7 +24,7 @@
 %endif
 
 Name:   sanlock
-Version:2.6
+Version:3.0.1
 Release:1%{?dist}
 Summary:A shared disk lock manager
 License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
@@ -52,7 +52,6 @@
 Source4:sysconfig.wdmd
 Source5:fence_sanlockd.init
 # Upstream patches
-Patch0: 0001-fix-systemd-service-files.patch
 # SUSE patches
 Patch100:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
 Patch101:   sanlock-python-prefix.patch
@@ -69,7 +68,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch100
 %patch101
 %patch102

++ sanlock-2.6.tar.bz2 -> sanlock-3.0.1.tar.bz2 ++
 6237 lines of diff (skipped)

++ sanlock-SCHED_RESET_ON_FORK-undefined.patch ++
--- /var/tmp/diff_new_pack.2BFocw/_old  2013-08-12 14:26:17.0 +0200
+++ /var/tmp/diff_new_pack.2BFocw/_new  2013-08-12 14:26:17.0 +0200
@@ -2,7 +2,7 @@
 ===
 --- src/main.c.orig
 +++ src/main.c
-@@ -56,6 +56,10 @@
+@@ -58,6 +58,10 @@
  
  #define SIGRUNPATH 100 /* anything that's not SIGTERM/SIGKILL */
  

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.2BFocw/_old  2013-08-12 14:26:17.0 +0200
+++ /var/tmp/diff_new_pack.2BFocw/_new  2013-08-12 14:26:17.0 +0200
@@ -1,8 +1,8 @@
-Index: sanlock-2.6/src/main.c
+Index: sanlock-3.0.1/src/main.c
 ===
 sanlock-2.6.orig/src/main.c
-+++ sanlock-2.6/src/main.c
-@@ -1841,8 +1841,8 @@ static int read_command_line(int argc, c
+--- sanlock-3.0.1.orig/src/main.c
 sanlock-3.0.1/src/main.c
+@@ -1863,8 +1863,8 @@ static int read_command_line(int argc, c
  
if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
!strcmp(arg1, "-V")) {

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.2BFocw/_old  2013-08-12 14:26:17.0 +0200
+++ /var/tmp/diff_new_pack.2BFocw/_new  2013-08-12 14:26:17.0 +0200
@@ -1,8 +1,8 @@
-Index: sanlock-2.6/init.d/sanlock.service
+Index: sanlock-3.0.1/init.d/sanlock.service
 ===
 sanlock-2.6.orig/init.d/sanlock.service
-+++ sanlock-2.6/init.d/sanlock.service
-@@ -5,8 +5,10 @@ After=syslog.target wdmd.service
+--- sanlock-3.0.1.orig/init.d/sanlock.service
 sanlock-3.0.1/init.d/sanlock.service
+@@ -6,8 +6,10 @@ Wants=wdmd.service
  [Service]
  Type=forking
  ControlGroup=cpu:/
@@ -15,10 +15,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-2.6/init.d/wdmd.service
+Index: sanlock-3.0.1/init.d/wdmd.service
 ===
 sanlock-2.6.orig/init.d/wdmd.service
-+++ sanlock-2.6/init.d/wdmd.service
+--- sanlock-3.0.1.orig/init.d/wdmd.service
 sanlock-3.0.1/init.d/wdmd.service
 @@ -5,8 +5,10 @@ After=syslog.target
  [Service]
  Type=forking

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit sanlock for openSUSE:Factory

2013-03-03 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2013-03-03 21:08:31

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock", Maintainer is "jfeh...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2012-12-19 
13:22:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2013-03-03 
21:08:33.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar  1 06:25:28 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.ov91rY/_old  2013-03-03 21:08:34.0 +0100
+++ /var/tmp/diff_new_pack.ov91rY/_new  2013-03-03 21:08:34.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sanlock
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,7 @@
 Version:2.6
 Release:1%{?dist}
 Summary:A shared disk lock manager
-License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
+License:GPL-2.0 and GPL-2.0+ and LGPL-2.1+
 Group:  System/Base
 
 Url:https://fedorahosted.org/sanlock/

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit sanlock for openSUSE:Factory

2012-12-19 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2012-12-19 13:22:31

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock", Maintainer is "jfeh...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2012-03-20 
11:35:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2012-12-19 
13:22:33.0 +0100
@@ -1,0 +2,8 @@
+Mon Dec  3 15:09:22 MST 2012 - jfeh...@suse.com
+
+- Update to sanlock 2.6
+  - Add fence_sanlock, a fence agent that uses /dev/watchdog to
+reset hosts (currently disabled)
+  - Various bug fixes and improvements
+
+---

Old:

  sanlock-2.1.tar.bz2

New:

  0001-fix-systemd-service-files.patch
  fence_sanlockd.init
  sanlock-2.6.tar.bz2
  sysconfig.wdmd



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.deg33j/_old  2012-12-19 13:22:34.0 +0100
+++ /var/tmp/diff_new_pack.deg33j/_new  2012-12-19 13:22:34.0 +0100
@@ -17,12 +17,14 @@
 
 
 %define with_systemd   0
+%define with_fence_sanlockd 0
+
 %if 0%{?suse_version} > 1140
 %define with_systemd   1
 %endif
 
 Name:   sanlock
-Version:2.1
+Version:2.6
 Release:1%{?dist}
 Summary:A shared disk lock manager
 License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
@@ -40,17 +42,23 @@
 %endif
 Requires(pre):  %insserv_prereq %fillup_prereq
 Requires:   %{name}-lib = %{version}-%{release}
+Recommends: logrotate
 # Latest version available at
 # https://fedorahosted.org/releases/s/a/sanlock/
 Source0:%{name}-%{version}.tar.bz2
 Source1:sanlock.init
-Source2:wdmd.init
-Source3:sysconfig.sanlock
-Patch0: sanlock-SCHED_RESET_ON_FORK-undefined.patch
-Patch1: sanlock-python-prefix.patch
-Patch2: sanlock-old_blkid.patch
-Patch3: suse-systemd.patch
-Patch4: suse-no-date-time.patch
+Source2:sysconfig.sanlock
+Source3:wdmd.init
+Source4:sysconfig.wdmd
+Source5:fence_sanlockd.init
+# Upstream patches
+Patch0: 0001-fix-systemd-service-files.patch
+# SUSE patches
+Patch100:   sanlock-SCHED_RESET_ON_FORK-undefined.patch
+Patch101:   sanlock-python-prefix.patch
+Patch102:   sanlock-old_blkid.patch
+Patch103:   suse-systemd.patch
+Patch104:   suse-no-date-time.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -61,11 +69,12 @@
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1
+%patch100
+%patch101
+%patch102
+%patch103 -p1
+%patch104 -p1
 
 %build
 # upstream does not require configure
@@ -73,6 +82,9 @@
 CFLAGS=$RPM_OPT_FLAGS make -C wdmd
 CFLAGS=$RPM_OPT_FLAGS make -C src
 CFLAGS=$RPM_OPT_FLAGS make -C python
+%if %{with_fence_sanlockd}
+CFLAGS=$RPM_OPT_FLAGS make -C fence_sanlock
+%endif
 
 %install
 make -C src \
@@ -84,20 +96,42 @@
 make -C python \
 install LIBDIR=%{_libdir} \
 DESTDIR=$RPM_BUILD_ROOT PREFIX=%_prefix
+%if %{with_fence_sanlockd}
+make -C fence_sanlock \
+install LIBDIR=%{_libdir} \
+DESTDIR=$RPM_BUILD_ROOT
+%endif
 install -D -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/sanlock
 ln -s /etc/init.d/sanlock $RPM_BUILD_ROOT%{_sbindir}/rcsanlock
-install -D -m 755 %SOURCE3 
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
-install -D -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/wdmd
+install -D -m 755 %SOURCE2 
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock
+install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/wdmd
 ln -s /etc/init.d/wdmd $RPM_BUILD_ROOT%{_sbindir}/rcwdmd
+install -D -m 755 %SOURCE4 
$RPM_BUILD_ROOT/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd
+%if %{with_fence_sanlockd}
+install -D -m 755 %SOURCE5 $RPM_BUILD_ROOT/%{_initddir}/fence_sanlockd
+ln -s /etc/init.d/fence_sanlockd $RPM_BUILD_ROOT%{_sbindir}/rcfence_sanlockd
+%endif
 %if %{with_systemd}
 install -D -m 755 init.d/sanlock.service 
$RPM_BUILD_ROOT/%{_unitdir}/sanlock.service
 install -D -m 755 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
+%if %{with_fence_sanlockd}
+install -D -m 0755 init.d/fence_sanlockd 
$RPM_BUILD_ROOT/lib/systemd/systemd-fence_sanlockd
+install -D -m 0644 init.d/fence_sanlockd.service 
$RPM_BUILD_ROOT/%{_unitdir}/fence_sanlockd.service
 %endif
+%endif
+
+install -Dm 0644 src/logrotate.sanlock \
+   $RPM_BUILD_ROOT/etc/logrotate.d/sanlock
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+%{_bindir}/geten

commit sanlock for openSUSE:Factory

2012-03-20 Thread h_root 
Hello community,

here is the log from the commit of package sanlock for openSUSE:Factory checked 
in at 2012-03-20 11:35:26

Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
 and  /work/SRC/openSUSE:Factory/.sanlock.new (New)


Package is "sanlock", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes  2012-01-27 
15:24:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2012-03-20 
11:35:28.0 +0100
@@ -1,0 +2,11 @@
+Tue Mar 13 12:04:11 MDT 2012 - jfeh...@suse.com
+
+- Update to sanlock 2.1
+  - python: release leases for other processes
+  - python: add shared resource parameter to acquire
+  - add a logrotate file
+  - status for all shared tokens
+  - retry transient sh failures
+  - fix inquire state string
+
+---

Old:

  sanlock-1.9.tar.gz

New:

  sanlock-2.1.tar.bz2



Other differences:
--
++ sanlock.spec ++
--- /var/tmp/diff_new_pack.FaUUmq/_old  2012-03-20 11:35:32.0 +0100
+++ /var/tmp/diff_new_pack.FaUUmq/_new  2012-03-20 11:35:32.0 +0100
@@ -15,22 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define with_systemd   0
 %if 0%{?suse_version} > 1140
 %define with_systemd   1
 %endif
 
-
 Name:   sanlock
-Version:1.9
+Version:2.1
 Release:1%{?dist}
 Summary:A shared disk lock manager
-
-Group:  System/Base
 License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
-URL:https://fedorahosted.org/sanlock/
+Group:  System/Base
+
+Url:https://fedorahosted.org/sanlock/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libblkid-devel libaio-devel python python-devel
+BuildRequires:  libaio-devel
+BuildRequires:  libblkid-devel
+BuildRequires:  python
+BuildRequires:  python-devel
 %if %{with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -39,7 +42,7 @@
 Requires:   %{name}-lib = %{version}-%{release}
 # Latest version available at
 # https://fedorahosted.org/releases/s/a/sanlock/
-Source0:%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.bz2
 Source1:sanlock.init
 Source2:wdmd.init
 Source3:sysconfig.sanlock

++ sanlock-1.9.tar.gz -> sanlock-2.1.tar.bz2 ++
 3484 lines of diff (skipped)

++ sanlock-SCHED_RESET_ON_FORK-undefined.patch ++
--- /var/tmp/diff_new_pack.FaUUmq/_old  2012-03-20 11:35:32.0 +0100
+++ /var/tmp/diff_new_pack.FaUUmq/_new  2012-03-20 11:35:32.0 +0100
@@ -2,9 +2,9 @@
 ===
 --- src/main.c.orig
 +++ src/main.c
-@@ -50,6 +50,10 @@
- #include "client_cmd.h"
- #include "cmd.h"
+@@ -52,6 +52,10 @@
+ 
+ #define RELEASE_VERSION "2.1"
  
 +#ifndef SCHED_RESET_ON_FORK
 +#define SCHED_RESET_ON_FORK 0
@@ -19,7 +19,7 @@
 +++ wdmd/main.c
 @@ -43,6 +43,10 @@
  
- #define RELEASE_VERSION "1.9"
+ #define RELEASE_VERSION "2.1"
  
 +#ifndef SCHED_RESET_ON_FORK
 +#define SCHED_RESET_ON_FORK 0

++ suse-no-date-time.patch ++
--- /var/tmp/diff_new_pack.FaUUmq/_old  2012-03-20 11:35:32.0 +0100
+++ /var/tmp/diff_new_pack.FaUUmq/_new  2012-03-20 11:35:32.0 +0100
@@ -1,8 +1,8 @@
-Index: sanlock-1.9/src/main.c
+Index: sanlock-2.1/src/main.c
 ===
 sanlock-1.9.orig/src/main.c
-+++ sanlock-1.9/src/main.c
-@@ -1430,8 +1430,7 @@ static int read_command_line(int argc, c
+--- sanlock-2.1.orig/src/main.c
 sanlock-2.1/src/main.c
+@@ -1439,8 +1439,7 @@ static int read_command_line(int argc, c
  
if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
!strcmp(arg1, "-V")) {

++ suse-systemd.patch ++
--- /var/tmp/diff_new_pack.FaUUmq/_old  2012-03-20 11:35:32.0 +0100
+++ /var/tmp/diff_new_pack.FaUUmq/_new  2012-03-20 11:35:32.0 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-1.9/init.d/sanlock.service
+Index: sanlock-2.1/init.d/sanlock.service
 ===
 sanlock-1.9.orig/init.d/sanlock.service
-+++ sanlock-1.9/init.d/sanlock.service
+--- sanlock-2.1.orig/init.d/sanlock.service
 sanlock-2.1/init.d/sanlock.service
 @@ -3,8 +3,9 @@ After=syslog.target wdmd.service
  
  [Service]
@@ -14,10 +14,10 @@
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-1.9/init.d/wdmd.service
+Index: sanlock-2.1/init.d/wdmd.service
 ===
 sanlock-1.9.orig/init.d/wdmd.service
-+++ sanlock-1.9/init.d/wdmd.service
+--- sanlock-2.1.orig/init.d/wdmd.service
 sanlock-2.1/init.d