From 27532a89813ad5988f93bc937c10f06d02d4ff05 Mon Sep 17 00:00:00 2001
From: Peter Hanecak <hany@hany.sk>
Date: Apr 29 2020 09:59:52 +0000
Subject: Upstream release of 9.12.2

Small spec tweaks
Updated xsltproc network read patch
Added patch for setup_option in v84
Build now requires also po4a

---

diff --git a/.gitignore b/.gitignore
index 1fd7423..e7af74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ drbd-8.3.7.tar.gz
 /drbd-utils-8.9.5.tar.gz
 /drbd-utils-8.9.6.tar.gz
 /drbd-utils-9.5.0.tar.gz
+/drbd-utils-9.12.2.tar.gz
+/drbd-utils-9.12.2-v84_setup_option.patch
+/drbd-utils-9.12.2-disable_xsltproc_network_read.patch
diff --git a/drbd.spec b/drbd.spec
index 63e9eaf..97943d0 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,11 +1,12 @@
 Name: drbd
 Summary: DRBD user-land tools and scripts
-Version: 9.5.0
-Release: 4%{?dist}
+Version: 9.12.2
+Release: 1%{?dist}
 Source0: http://www.linbit.com/downloads/%{name}/utils/%{name}-utils-%{version}.tar.gz
 Source1: drbd.service
 Source2: drbd.ocf
-Patch0: disable_xsltproc_network_read.patch
+Patch0: drbd-utils-9.12.2-disable_xsltproc_network_read.patch
+Patch1: drbd-utils-9.12.2-v84_setup_option.patch
 License: GPLv2+
 ExclusiveOS: linux
 URL: http://www.drbd.org/
@@ -15,6 +16,7 @@ BuildRequires: flex
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: perl-generators
+BuildRequires: po4a
 Requires: %{name}-utils = %{version}
 Requires: %{name}-udev = %{version}
 BuildRequires: udev
@@ -35,7 +37,8 @@ This is a virtual package, installing the full user-land suite.
 %setup -q -n drbd-utils-%{version}
 
 # Don't let xsltproc make network calls during build
-%patch0 -p0
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -51,11 +54,13 @@ This is a virtual package, installing the full user-land suite.
     --with-rgmanager \
     --with-distro=generic \
     --with-initdir=%{_initddir}
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+#make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 
 # Remove old init script, replace with systemd unit file
 rm -f $RPM_BUILD_ROOT/%{_initddir}/drbd
@@ -85,7 +90,6 @@ This packages includes the DRBD administration tools.
 %{_sbindir}/drbdadm
 %{_sbindir}/drbdmeta
 %{_sbindir}/drbdmon
-%{_sbindir}/drbd-overview
 
 # systemd-related stuff
 %attr(0644,root,root) %{_unitdir}/drbd.service
@@ -110,7 +114,7 @@ This packages includes the DRBD administration tools.
 %{_mandir}/ja/man5/drbd*gz
 %{_mandir}/ja/man8/drbd*gz
 %doc scripts/drbd.conf.example
-%doc COPYING
+%license COPYING
 %doc ChangeLog
 
 
@@ -156,6 +160,7 @@ Pacemaker High Availability cluster manager.
 %defattr(755,root,root,-)
 %{_prefix}/lib/ocf/resource.d/linbit/drbd
 %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh
+%{_mandir}/man7/ocf_linbit_drbd*gz
 
 
 %package rgmanager
@@ -197,6 +202,13 @@ management utility.
 %systemd_preun drbd.service
 
 %changelog
+* Wed Apr 29 2020 Peter Hanecak <hany@hany.sk> - 9.12.2-1
+- Upstream release of 9.12.2
+- Small spec tweaks
+- Updated xsltproc network read patch
+- Added patch for setup_option in v84
+- Build now requires also po4a
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 7166f65..eaa55ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (drbd-utils-9.5.0.tar.gz) = fb81f5f6d709970c163c4457c4620feb4134330a40a8120aede237dc108935d708fb571cb53d26c2c34bb7000b552f00743fa0a9869fcdde1459440be25b4205
+SHA512 (drbd-utils-9.12.2-disable_xsltproc_network_read.patch) = 010e009d89c7fa3e4d4864a07923c9b396eb07bcacd86186021b9aaf6f679cf45443da96a84a9537b068bef58d9fc1b4add0ec877efbe7e2bcc484ccafaa96ba