up to 6.8.0

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 7b0ef0f39938050204a62b94b1eb8552170f4ad5..dcac6a1bf7c57c751bbca1a30e7e4af9a8b64aec 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,18 +1,19 @@
 #
 # Conditional build:
 %bcond_without debug_asserts
-%bcond_without scrub
+%bcond_without libicu          # libicu (unicode scanning in xfs_scrub)
+%bcond_without scrub           # xfs_scrub utility
 %bcond_without static_libs     # static library
 #
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       6.7.0
+Version:       6.8.0
 Release:       1
 License:       LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
-# Source0-md5: 0bde7bc8b3d8cbbd01064f756f67911f
+# Source0-md5: 26fc29481cb1934ea659c327b2228f71
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
@@ -29,7 +30,7 @@ BuildRequires:        inih-devel
 BuildRequires: libblkid-devel
 # without .la file so that -static-libtool-libs won't take libedit.a
 BuildRequires: libedit-devel >= 3.1-1.20191231.1
-BuildRequires: libicu-devel
+%{?with_libicu:BuildRequires:  libicu-devel}
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-static
@@ -140,7 +141,7 @@ msgmerge po/pl.po.upstream po/xfsprogs.pot -o po/pl.po
        OPTIMIZER="%{rpmcflags}" \
        --enable-editline \
        --enable-gettext \
-       --enable-libicu \
+       %{__enable_disable libicu libicu} \
        --disable-lto \
        %{?with_scrub:--enable-scrub=yes} \
        %{__enable_disable static_libs static} \
@@ -213,8 +214,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /%{_lib}/libhandle.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhandle.so.1
 %{_datadir}/%{name}
-%dir %{_libexecdir}/%{name}
 %if %{with scrub}
+%dir %{_libexecdir}/%{name}
 %attr(755,root,root) %{_libexecdir}/%{name}/xfs_scrub_fail
 %endif
 %{_mandir}/man5/projects.5*