up to 6.8.0

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index c70c35fe7e21113da9e87813b95bd8c4fdb4dab1..dcac6a1bf7c57c751bbca1a30e7e4af9a8b64aec 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,21 +1,22 @@
 #
 # 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.3.0
-Release:       2
+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: 4bb3f51310a54282a92c61ce7d2c8cd8
+# Source0-md5: 26fc29481cb1934ea659c327b2228f71
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
-# Patch1-md5:  ec989fa2cc45cb5ff8b4cba2b5eb0fa7
 URL:           https://xfs.wiki.kernel.org/
 # for <attr/attributes.h>
 BuildRequires: attr-devel
@@ -29,13 +30,13 @@ 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
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.402
+BuildRequires: rpmbuild(macros) >= 1.527
 %{?with_scrub:BuildRequires:   systemd-devel}
 BuildRequires: userspace-rcu-devel
 BuildRequires: userspace-rcu-static
@@ -121,7 +122,14 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+# files order in pot changes in every version, making diff huge - sort entries first
+%{__mv} po/xfsprogs.pot po/xfsprogs.pot.upstream
+msgcat -F po/xfsprogs.pot.upstream -o po/xfsprogs.pot
+# update line numbers etc.
+%{__mv} po/pl.po po/pl.po.upstream
+msgmerge po/pl.po.upstream po/xfsprogs.pot -o po/pl.po
+%patch1 -p1 -b .orig
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in tools/xfsbuflock.py
 
@@ -131,12 +139,13 @@ Biblioteki statyczne do XFS.
 %configure \
        DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
        OPTIMIZER="%{rpmcflags}" \
-       --enable-blkid \
        --enable-editline \
        --enable-gettext \
-       --enable-libicu \
+       %{__enable_disable libicu libicu} \
        --disable-lto \
-       %{?with_scrub:--enable-scrub=yes}
+       %{?with_scrub:--enable-scrub=yes} \
+       %{__enable_disable static_libs static} \
+       --with-udev-rule-dir=/lib/udev/rules.d
 
 %{__make} \
        V=1
@@ -168,9 +177,9 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*) \
 
 # install cron file
 %if %{with scrub}
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
 %else
-%{__rm} $RPM_BUILD_ROOT/%{_libdir}/%{name}/xfs_scrub_all.cron
+%{__rm} $RPM_BUILD_ROOT/%{_datadir}/%{name}/xfs_scrub_all.cron
 %endif
 
 # (config file paths are specified in libfrog/projects.c)
@@ -205,9 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /%{_lib}/libhandle.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libhandle.so.1
 %{_datadir}/%{name}
-%dir %{_libdir}/%{name}
 %if %{with scrub}
-%attr(755,root,root) %{_libdir}/%{name}/xfs_scrub_fail
+%dir %{_libexecdir}/%{name}
+%attr(755,root,root) %{_libexecdir}/%{name}/xfs_scrub_fail
 %endif
 %{_mandir}/man5/projects.5*
 %{_mandir}/man5/projid.5*
@@ -224,6 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/xfs_scrub
 %attr(755,root,root) %{_sbindir}/xfs_scrub_all
+/lib/udev/rules.d/64-xfs.rules
 %{systemdunitdir}/xfs_scrub@.service
 %{systemdunitdir}/xfs_scrub_all.service
 %{systemdunitdir}/xfs_scrub_all.timer
@@ -258,6 +268,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libhandle.a
+%endif