From a40c18e832b714a55d2466931f6b74e6a8521b24c371c8394a1abf1a6d6243bb Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Fri, 16 Feb 2018 22:45:15 +0000
Subject: [PATCH 1/2] Accepting request 577497 from
 home:dsterba:branches:filesystems

- enable static build again, zstd now has static version

OBS-URL: https://build.opensuse.org/request/show/577497
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=288
---
 btrfsprogs.changes | 5 +++++
 btrfsprogs.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 9ff9104..42b8dce 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 14 00:00:00 CET 2018 - dsterba@suse.cz
+
+- enable static build again, zstd now has static version
+
 -------------------------------------------------------------------
 Fri Feb  2 00:00:00 CET 2018 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 53d8961..62d8839 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -24,8 +24,7 @@
 %if 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1315
 %define build_static	0
 %else
-# temporarily disable until libzstd-devel-static
-%define build_static	0
+%define build_static	1
 %endif
 
 Name:           btrfsprogs
@@ -91,6 +90,7 @@ BuildRequires:  libblkid-devel-static
 BuildRequires:  libcom_err-devel-static
 BuildRequires:  libext2fs-devel-static
 BuildRequires:  libuuid-devel-static
+BuildRequires:  libzstd-devel-static
 BuildRequires:  lzo-devel-static
 BuildRequires:  zlib-devel-static
 

From 42824234c3bf358d98c659b972dfcef6c671b5e3a152114d1989980d7d84fa06 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Sat, 17 Feb 2018 00:21:22 +0000
Subject: [PATCH 2/2] Accepting request 577505 from
 home:dsterba:branches:filesystems

- use documentation shipped by upstream tar, reduce dependencies

OBS-URL: https://build.opensuse.org/request/show/577505
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=289
---
 btrfsprogs.changes |  5 +++++
 btrfsprogs.spec    | 20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 42b8dce..58a1014 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 17 00:00:00 CET 2018 - dsterba@suse.cz
+
+- use documentation shipped by upstream tar, reduce dependencies
+
 -------------------------------------------------------------------
 Wed Feb 14 00:00:00 CET 2018 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 62d8839..9f0be57 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -27,6 +27,9 @@
 %define build_static	1
 %endif
 
+# the tarball contains prebuilt documentation
+%define build_docs	0
+
 Name:           btrfsprogs
 Version:        4.15
 Release:        0
@@ -44,7 +47,9 @@ Source5:        sles11-defaults.h
 
 Patch1:         mkfs-default-features.patch
 
+%if %build_docs
 BuildRequires:  asciidoc
+%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libattr-devel
@@ -65,7 +70,9 @@ BuildRequires:  udev
 %if 0%{?suse_version} == 1310
 BuildRequires:  libudev-devel
 %endif
+%if %build_docs
 BuildRequires:  xmlto
+%endif
 BuildRequires:  zlib-devel
 %if 0%{?suse_version} >= 1310
 Requires(post): coreutils
@@ -150,6 +157,9 @@ export CFLAGS="%optflags -include sles11-defaults.h"
 %endif
 
 %configure			\
+%if !%build_docs
+			--disable-documentation	\
+%endif
 %if 0%{?suse_version} <= 1500
 			--disable-zstd
 %endif
@@ -166,6 +176,15 @@ make install		\
 %endif
 	DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir}
 
+%if !%build_docs
+cd Documentation
+# fool make to avoid rebuilding some of the sources
+touch btrfs-man5.5.gz btrfs-man5.asciidoc
+touch btrfs-ioctl.asciidoc touch btrfs-ioctl.3.gz
+make V=1 MV=mv DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir} install
+cd ..
+%endif
+
 %if %build_static
 make install-static DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir}
 %endif
@@ -197,7 +216,6 @@ install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/
 install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/
 install -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/
 %endif
-find %{buildroot} -type f -name "*.la" -delete -print
 # don't install .a for now
 rm -f %{buildroot}/%{_libdir}/*.a
 # bash completion