From 172f799372636e0ae4ad8d5bdfdae5cd6ef0468084588108e5b1622f21f0ac55 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 15 Jun 2021 09:47:31 +0000 Subject: [PATCH 1/3] 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} From c3c4cac6935a8229731d5c96d69d00514a60a7d4be89debe9267e068b6746af0 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 16 Jun 2021 11:36:34 +0000 Subject: [PATCH 2/3] - revert previous change, unintentionally disables zstd on tumbleweed OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=351 --- btrfsprogs.changes | 5 +++++ btrfsprogs.spec | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 3c22afc..6c57008 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 16 00:00:00 CEST 2021 - dsterba@suse.cz + +- revert previous change, unintentionally disables zstd on tumbleweed + ------------------------------------------------------------------- Tue Jun 15 02:57:07 UTC 2021 - Cameron Rapp diff --git a/btrfsprogs.spec b/btrfsprogs.spec index e80e32c..33f4b03 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 || 0%{?sle_version} > 120200 +%if 0%{?suse_version} > 1500 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 || 0%{?sle_version} > 120200 +%if 0%{?suse_version} > 1500 BuildRequires: libzstd-devel-static %endif BuildRequires: lzo-devel-static @@ -203,13 +203,9 @@ export CFLAGS="%{optflags} -include sles11-defaults.h" %if !%{build_docs} --disable-documentation \ %endif -%if 0%{?sle_version} < 120300 +%if 0%{?suse_version} <= 1500 --disable-zstd %endif -%if 0%{?suse_version} < 1550 - --disable-zoned -%endif - make V=1 %{?_smp_mflags} all \ %if %{build_static} From 878e511300626fd6e256acf1099fef36160d47b52c4aa8894c129604f5a27828 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 2 Jul 2021 15:46:44 +0000 Subject: [PATCH 3/3] Accepting request 900435 from home:Maliku - Add --disable-zoned for leap OBS-URL: https://build.opensuse.org/request/show/900435 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=352 --- btrfsprogs.changes | 5 +++++ btrfsprogs.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 6c57008..fc6469b 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 16 17:02:36 UTC 2021 - Cameron Rapp + +- Add --disable-zoned for leap + ------------------------------------------------------------------- Wed Jun 16 00:00:00 CEST 2021 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 33f4b03..d45bc37 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -204,6 +204,7 @@ export CFLAGS="%{optflags} -include sles11-defaults.h" --disable-documentation \ %endif %if 0%{?suse_version} <= 1500 + --disable-zoned \ --disable-zstd %endif