- updated pl.po-update patch

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index e0e642ee5b11d79e7c8732c621732034c579eafd..bd9887c6324e66004b6fe4e9b1eac9b6198662f6 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,24 +1,25 @@
 #
 # Conditional build:
 %bcond_without debug_asserts
+%bcond_without scrub
 #
 Summary:       Tools for the XFS filesystem
 Summary(pl.UTF-8):     Narzędzia do systemu plików XFS
 Name:          xfsprogs
-Version:       5.12.0
+Version:       6.4.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: b401d76ccd66e4fdf3d123193e5e1b91
+# Source0-md5: 81c09e5ea47412c3a109a316cf4dd39d
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
-# Patch1-md5:  5f6c7d4431759133a3a9a19ef3baf34c
+# Patch1-md5:  55cb49efcff3c0610da1c6408d936c58
 URL:           https://xfs.wiki.kernel.org/
 # for <attr/attributes.h>
 BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: bash
 BuildRequires: device-mapper-devel
@@ -32,12 +33,16 @@ BuildRequires:      libicu-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-static
+BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.402
+%{?with_scrub:BuildRequires:   systemd-devel}
+BuildRequires: userspace-rcu-devel
+BuildRequires: userspace-rcu-static
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Obsoletes:     xfsprogs-initrd
+Obsoletes:     xfsprogs-initrd < 3.1.11-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{pld_release}" == "ac"
@@ -91,6 +96,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe i biblioteki
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libuuid-devel
+Requires:      linux-libc-headers
 
 %description devel
 Header files and libraries to develop software which operates on XFS
@@ -130,9 +136,9 @@ Biblioteki statyczne do XFS.
        --enable-gettext \
        --enable-libicu \
        --disable-lto \
-       --enable-scrub=yes
+       %{?with_scrub:--enable-scrub=yes}
 
-%{__make} -j1 \
+%{__make} \
        V=1
 
 %install
@@ -161,7 +167,11 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*) \
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/libhandle.{so,la,a}
 
 # install cron file
+%if %{with scrub}
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
+%else
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/%{name}/xfs_scrub_all.cron
+%endif
 
 # (config file paths are specified in libfrog/projects.c)
 echo "#10:/mnt/ftp/roman"  >> $RPM_BUILD_ROOT/etc/projects
@@ -189,19 +199,27 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /sbin/mkfs.xfs
 %attr(755,root,root) /sbin/xfs_repair
 %attr(755,root,root) %{_sbindir}/xfs_*
+%if %{with scrub}
 %exclude %{_sbindir}/xfs_scrub*
+%endif
 %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
+%endif
 %{_mandir}/man5/projects.5*
 %{_mandir}/man5/projid.5*
 %{_mandir}/man5/xfs.5*
 %{_mandir}/man8/fsck.xfs.8*
 %{_mandir}/man8/mkfs.xfs.8*
 %{_mandir}/man8/xfs_*.8*
+%if %{with scrub}
 %exclude %{_mandir}/man8/xfs_scrub*.8*
+%endif
 
+%if %{with scrub}
 %files scrub
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/xfs_scrub
@@ -213,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/xfs_scrub_all
 %{_mandir}/man8/xfs_scrub.8*
 %{_mandir}/man8/xfs_scrub_all.8*
+%endif
 
 %files devel
 %defattr(644,root,root,755)