Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2018-02-18 11:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs" Sun Feb 18 11:40:32 2018 rev:93 rq:577506 version:4.15 Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2018-02-05 10:49:09.887108269 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes 2018-02-18 11:40:33.825478968 +0100 @@ -1,0 +2,10 @@ +Sat Feb 17 00:00:00 CET 2018 - dste...@suse.cz + +- use documentation shipped by upstream tar, reduce dependencies + +------------------------------------------------------------------- +Wed Feb 14 00:00:00 CET 2018 - dste...@suse.cz + +- enable static build again, zstd now has static version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.9eiftp/_old 2018-02-18 11:40:35.069434314 +0100 +++ /var/tmp/diff_new_pack.9eiftp/_new 2018-02-18 11:40:35.073434170 +0100 @@ -24,10 +24,12 @@ %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 +# the tarball contains prebuilt documentation +%define build_docs 0 + Name: btrfsprogs Version: 4.15 Release: 0 @@ -45,7 +47,9 @@ Patch1: mkfs-default-features.patch +%if %build_docs BuildRequires: asciidoc +%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: libattr-devel @@ -66,7 +70,9 @@ %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 @@ -91,6 +97,7 @@ 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 @@ -150,6 +157,9 @@ %endif %configure \ +%if !%build_docs + --disable-documentation \ +%endif %if 0%{?suse_version} <= 1500 --disable-zstd %endif @@ -166,6 +176,15 @@ %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 -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