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}