From 4046b934494fe6b114c46168a9005f132a89ea47b3a5ab2c3453a071e6d9536d Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Tue, 12 Mar 2019 09:10:15 +0000
Subject: [PATCH] Accepting request 684204 from network:ha-clustering:Stable

Update to 9.8.0

OBS-URL: https://build.opensuse.org/request/show/684204
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=73
---
 _service                |  4 ++--
 drbd-utils-9.6.0.tar.gz |  3 ---
 drbd-utils-9.8.0.tar.gz |  3 +++
 drbd-utils.changes      | 31 +++++++++++++++++++++++++++++++
 drbd-utils.spec         | 21 ++++++++++++++++++++-
 5 files changed, 56 insertions(+), 6 deletions(-)
 delete mode 100644 drbd-utils-9.6.0.tar.gz
 create mode 100644 drbd-utils-9.8.0.tar.gz

diff --git a/_service b/_service
index 6ebb41a..7af9149 100644
--- a/_service
+++ b/_service
@@ -5,10 +5,10 @@
     <param name="filename">drbd-utils</param>
 <!--
     build service using release drbd-utils atm.
-    <param name="version">9.6.0</param>
+    <param name="version">9.7.0</param>
     Using release tarball instead of git since need buildtag.c/h
 -->
-    <param name="versionformat">9.6.0+git.%h</param>
+    <param name="versionformat">9.7.0+git.%h</param>
     <param name="revision">master</param>
   </service>
 
diff --git a/drbd-utils-9.6.0.tar.gz b/drbd-utils-9.6.0.tar.gz
deleted file mode 100644
index debdbfa..0000000
--- a/drbd-utils-9.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5cb6ced9c5a688f94328f423c77dc74dc26eb8af5f1211bd800c283d5dd7605
-size 1067391
diff --git a/drbd-utils-9.8.0.tar.gz b/drbd-utils-9.8.0.tar.gz
new file mode 100644
index 0000000..946588f
--- /dev/null
+++ b/drbd-utils-9.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdc2116b217fe4ed15f6e3754eadacb6bd8d89de079a21556de0fbb775790e0c
+size 1185568
diff --git a/drbd-utils.changes b/drbd-utils.changes
index c3b9857..7049c43 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Thu Jan 17 07:16:25 UTC 2019 - nwang@suse.com
+
+- Update to 9.8.0
+ * i18n: use propper po files
+ * v9,stacked: allow node-id in stacked section
+   but one should not use stacked with v9 anyways
+ * dry run: remove trailing white space
+   This eases test integration.
+   Mentioned here because strictly speaking output changed.
+ * regression tests: if at ./configure time "clitest" is detected,
+  one can run tests via "make test". Target is a noop otherwise.
+ * drbdsetup,v9: fix wait-for (same patch as in 9.7.1)
+ * doc,v9:  require-drbd-module-version-*, events2 --now --poll
+ * drbdadm,v9: allow stacked-on-top-of sections without address
+ * drbdadm,v9: bring up only the correct paths in multi-site scenaios.
+ * drbdadm,v9: fix parser segfault if node-id is missing.
+ * tests: require that they pass on release.
+ * drbdsetup,v9: fix key collision in show --json. 
+- bsc#1121794, use drbd9 man pages.
+
+-------------------------------------------------------------------
+Wed Dec  5 09:01:02 UTC 2018 - nwang@suse.com
+
+- Update to 9.7.0 
+ * drbdadm,v9,v84: fix resync-after
+ * drbd.ocf: connect_only_after_promote, require kernel version
+ * drbdmon: display resync progress
+ * parser,v9: require-drbd-module-version
+ * windrbd: add WinDRBD support
+
 -------------------------------------------------------------------
 Tue Oct 30 08:05:03 UTC 2018 - nwang@suse.com
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index 07b8230..084620c 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -17,9 +17,12 @@
 
 
 %bcond_without drbdmon
+# Man pages are included in the released tarball.
+# Only need po4a to build man from git source code
+%bcond_without prebuiltman
 
 Name:           drbd-utils
-Version:        9.6.0
+Version:        9.8.0
 Release:        0
 Summary:        Distributed Replicated Block Device
 License:        GPL-2.0+
@@ -65,6 +68,9 @@ BuildRequires:  udev
 %if %{with drbdmon}
 BuildRequires:  gcc-c++
 %endif
+%if %{without prebuiltman}
+BuildRequires: po4a
+%endif
 Provides:       drbd-control
 Provides:       drbdsetup
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -104,6 +110,7 @@ PATH=/sbin:$PATH ./configure \
     --libdir=%{_prefix}/lib \
     --exec_prefix=%{_prefix}/lib \
     %{?with_drbdmon:   --with-drbdmon}     \
+    %{?with_prebuiltman: --with-prebuiltman} \
     --with-tmpfilesdir=%{_tmpfilesdir}
 
 make OPTFLAGS="%{optflags}" %{?_smp_mflags}
@@ -122,6 +129,18 @@ rm -rf %{buildroot}%{_sysconfdir}/xen
 %post
 %service_add_post drbd.service
 
+#May also overlap the $MAN_LINK in documentation/v9/Makefile.in
+for f in drbd drbdadm drbdmeta drbdsetup; do
+    ln -sf $f-9.0.8.gz %{_mandir}/man8/$f.8.gz
+    ln -sf $f-9.0.8.gz %{_mandir}/ja/man8/$f.8.gz
+done
+ln -sf drbd.conf-9.0.5.gz %{_mandir}/man5/drbd.conf.5.gz
+ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
+%if %{with drbdmon}
+ln -sf drbdmon-9.0.8.gz %{_mandir}/man8/drbdmon.8.gz
+ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
+%endif
+
 %preun
 %service_del_preun drbd.service