From 172f799372636e0ae4ad8d5bdfdae5cd6ef0468084588108e5b1622f21f0ac55 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 15 Jun 2021 09:47:31 +0000 Subject: [PATCH] Accepting request 900006 from home:Maliku - Fix build for leap * --disable-zstd if leap < 42.3 * --disable-zoned for leap OBS-URL: https://build.opensuse.org/request/show/900006 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=350 --- btrfsprogs.changes | 7 +++++++ btrfsprogs.spec | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 41a251f..3c22afc 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 15 02:57:07 UTC 2021 - Cameron Rapp + +- Fix build for leap + * --disable-zstd if leap < 42.3 + * --disable-zoned for leap + ------------------------------------------------------------------- Thu May 13 00:00:00 CEST 2021 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 33f4b03..e80e32c 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -66,7 +66,7 @@ BuildRequires: libext2fs-devel BuildRequires: libreiserfscore-devel >= 3.6.27 Requires: libreiserfscore0 >= 3.6.27 BuildRequires: libuuid-devel -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 120200 BuildRequires: libzstd-devel %endif BuildRequires: lzo-devel @@ -105,7 +105,7 @@ BuildRequires: libblkid-devel-static BuildRequires: libcom_err-devel-static BuildRequires: libext2fs-devel-static BuildRequires: libuuid-devel-static -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 120200 BuildRequires: libzstd-devel-static %endif BuildRequires: lzo-devel-static @@ -203,9 +203,13 @@ export CFLAGS="%{optflags} -include sles11-defaults.h" %if !%{build_docs} --disable-documentation \ %endif -%if 0%{?suse_version} <= 1500 +%if 0%{?sle_version} < 120300 --disable-zstd %endif +%if 0%{?suse_version} < 1550 + --disable-zoned +%endif + make V=1 %{?_smp_mflags} all \ %if %{build_static}