[drbd] New upstream release 8.9.1

[Major Hayden]

commit b9d82978e2ed5de3f270fe2a469329075cb79d73
Author: Major Hayden <major at mhtx.net>
Date:   Thu Dec 4 21:59:25 2014 +0000

    New upstream release 8.9.1

 .gitignore                          |    1 +
 disable_xsltproc_network_read.patch |   11 +++++++++++
 drbd.spec                           |   20 +++++++++++++++-----
 sources                             |    2 +-
 4 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e17205..5c24f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ drbd-8.3.7.tar.gz
 /drbd-8.4.3.tar.gz
 /drbd-8.4.4.tar.gz
 /drbd-utils-8.9.0.tar.gz
+/drbd-8.9.1-1.fc22.src.rpm
diff --git a/disable_xsltproc_network_read.patch b/disable_xsltproc_network_read.patch
new file mode 100644
index 0000000..c2c1d9a
--- /dev/null
+++ b/disable_xsltproc_network_read.patch
@@ -0,0 +1,11 @@
+--- documentation/Makefile.in	2014-12-04 21:20:04.806764917 +0000
++++ documentation/Makefile.in	2014-12-04 21:19:59.071764572 +0000
+@@ -59,7 +59,7 @@
+ HTML_STYLESHEET ?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
+ FO_STYLESHEET ?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
+
+-XSLTPROC_OPTIONS ?= --xinclude
++XSLTPROC_OPTIONS ?= --nonet --xinclude
+ XSLTPROC_OPTIONS += --stringparam variablelist.term.break.after 1
+ #XSLTPROC_OPTIONS += --stringparam variablelist.term.separator ""
+ XSLTPROC_MANPAGES_OPTIONS ?= $(XSLTPROC_OPTIONS)
diff --git a/drbd.spec b/drbd.spec
index bac4b37..0544d85 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,16 +1,19 @@
 Name: drbd
 Summary: DRBD user-land tools and scripts 
-Version: 8.9.0
-Release: 8%{?dist}
+Version: 8.9.1
+Release: 1%{?dist}
 Source0: http://oss.linbit.com/%{name}/%{name}-utils-%{version}.tar.gz
 Source1: drbd.service
 Patch0: disable_drbd_checkin.patch
+Patch1: disable_xsltproc_network_read.patch
 License: GPLv2+
 ExclusiveOS: linux
 Group: System Environment/Kernel
 URL: http://www.drbd.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: flex
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
 Requires: %{name}-utils = %{version}
 Requires: %{name}-udev = %{version}
 BuildRequires: udev
@@ -35,6 +38,9 @@ This is a virtual package, installing the full user-land suite.
 # Disable the automatic checkin with drbd starts
 %patch0 -p0
 
+# Don't let xsltproc make network calls during build
+%patch1 -p0
+
 %build
 %configure \
     --with-utils \
@@ -59,10 +65,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_initddir}/drbd
 install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/drbd.service
+rm -f $RPM_BUILD_ROOT/drbd.service
 
 # Relocate udev rules to the location systemd expects to find them
-install -d -m755 $RPM_BUILD_ROOT/%{_udevrulesdir}
-mv $RPM_BUILD_ROOT/etc/udev/rules.d/* $RPM_BUILD_ROOT/%{_udevrulesdir}/
+#install -d -m755 $RPM_BUILD_ROOT/%{_udevrulesdir}
+#mv $RPM_BUILD_ROOT/lib/udev/rules.d/* $RPM_BUILD_ROOT/%{_udevrulesdir}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,7 +146,7 @@ DRBD devices in /dev/drbd/by-res and /dev/drbd/by-disk.
 
 %files udev
 %defattr(-,root,root,-)
-%config %{_udevrulesdir}/65-drbd.rules*
+%config /lib/udev/65-drbd.rules
 
 
 
@@ -204,6 +211,9 @@ management utility.
 %systemd_preun sshd.service
 
 %changelog
+* Thu Dec 04 2014 Major Hayden <major at mhtx.net> - 8.9.1-1
+- New upstream release 8.9.1.
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.9.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 6462e47..f97f52d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ed5bbfa327440dc64bcf46d7cf9e5e5  drbd-utils-8.9.0.tar.gz
+89b370510d3ea1034a377519090f154c  drbd-8.9.1-1.fc22.src.rpm