- revert previous change, unintentionally disables zstd on tumbleweed

OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=351
This commit is contained in:
David Sterba 2021-06-16 11:36:34 +00:00 committed by Git OBS Bridge
parent 172f799372
commit c3c4cac693
2 changed files with 8 additions and 7 deletions

View File

@ -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 <camspam@redhyena.net> Tue Jun 15 02:57:07 UTC 2021 - Cameron Rapp <camspam@redhyena.net>

View File

@ -66,7 +66,7 @@ BuildRequires: libext2fs-devel
BuildRequires: libreiserfscore-devel >= 3.6.27 BuildRequires: libreiserfscore-devel >= 3.6.27
Requires: libreiserfscore0 >= 3.6.27 Requires: libreiserfscore0 >= 3.6.27
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 120200 %if 0%{?suse_version} > 1500
BuildRequires: libzstd-devel BuildRequires: libzstd-devel
%endif %endif
BuildRequires: lzo-devel BuildRequires: lzo-devel
@ -105,7 +105,7 @@ BuildRequires: libblkid-devel-static
BuildRequires: libcom_err-devel-static BuildRequires: libcom_err-devel-static
BuildRequires: libext2fs-devel-static BuildRequires: libext2fs-devel-static
BuildRequires: libuuid-devel-static BuildRequires: libuuid-devel-static
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 120200 %if 0%{?suse_version} > 1500
BuildRequires: libzstd-devel-static BuildRequires: libzstd-devel-static
%endif %endif
BuildRequires: lzo-devel-static BuildRequires: lzo-devel-static
@ -203,13 +203,9 @@ export CFLAGS="%{optflags} -include sles11-defaults.h"
%if !%{build_docs} %if !%{build_docs}
--disable-documentation \ --disable-documentation \
%endif %endif
%if 0%{?sle_version} < 120300 %if 0%{?suse_version} <= 1500
--disable-zstd --disable-zstd
%endif %endif
%if 0%{?suse_version} < 1550
--disable-zoned
%endif
make V=1 %{?_smp_mflags} all \ make V=1 %{?_smp_mflags} all \
%if %{build_static} %if %{build_static}