- added pl.po-update patch

[packages/xfsprogs.git] / xfsprogs.spec

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 5e5b7e3a9c5c5851a9b872475cbd587d5b9e7d63..9753b33058411efa138fca5178f579613c06d2b8 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,32 +1,47 @@
+#
+# 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:       4.18.0
-Release:       2
+Version:       6.6.0
+Release:       1
 License:       LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:         Applications/System
-Source0:       https://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 6a2a92d3d63e3548b86fd7ad1a8f5af2
+Source0:       https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
+# Source0-md5: c008a752fae65aaf761096eb4698df86
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-pl.po-update.patch
-URL:           http://www.xfs.org/
-BuildRequires: autoconf >= 2.50
+URL:           https://xfs.wiki.kernel.org/
+# for <attr/attributes.h>
+BuildRequires: attr-devel
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: bash
+BuildRequires: device-mapper-devel
 BuildRequires: gettext-tools
 BuildRequires: glibc-static
+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
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libuuid-static
-BuildRequires: readline-devel
+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
-Obsoletes:     xfsprogs-initrd
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Obsoletes:     xfsprogs-initrd < 3.1.11-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{pld_release}" == "ac"
@@ -80,6 +95,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
@@ -114,12 +130,15 @@ Biblioteki statyczne do XFS.
 %configure \
        DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
        OPTIMIZER="%{rpmcflags}" \
-       --enable-lto=no \
        --enable-blkid \
+       --enable-editline \
        --enable-gettext \
-       --enable-readline
+       --enable-libicu \
+       --disable-lto \
+       %{?with_scrub:--enable-scrub=yes} \
+       --with-udev-rule-dir=/lib/udev/rules.d
 
-%{__make} -j1 \
+%{__make} \
        V=1
 
 %install
@@ -148,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
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
+%if %{with scrub}
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
+%else
+%{__rm} $RPM_BUILD_ROOT/%{_datadir}/%{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
@@ -176,22 +199,32 @@ 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
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/xfs_scrub_fail
+%{_datadir}/%{name}
+%dir %{_libexecdir}/%{name}
+%if %{with scrub}
+%attr(755,root,root) %{_libexecdir}/%{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) /sbin/xfs_scrub
-%attr(755,root,root) /sbin/xfs_scrub_all
+%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
@@ -199,13 +232,30 @@ 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)
 %attr(755,root,root) %{_libdir}/libhandle.so
 %{_libdir}/libhandle.la
 %{_includedir}/xfs
+%{_mandir}/man2/ioctl_xfs_ag_geometry.2*
+%{_mandir}/man2/ioctl_xfs_bulkstat.2*
+%{_mandir}/man2/ioctl_xfs_fsbulkstat.2*
+%{_mandir}/man2/ioctl_xfs_fscounts.2*
+%{_mandir}/man2/ioctl_xfs_fsgeometry.2*
+%{_mandir}/man2/ioctl_xfs_fsgetxattr.2*
+%{_mandir}/man2/ioctl_xfs_fsgetxattra.2*
+%{_mandir}/man2/ioctl_xfs_fsinumbers.2*
+%{_mandir}/man2/ioctl_xfs_fssetxattr.2*
+%{_mandir}/man2/ioctl_xfs_getbmap.2*
+%{_mandir}/man2/ioctl_xfs_getbmapa.2*
+%{_mandir}/man2/ioctl_xfs_getbmapx.2*
+%{_mandir}/man2/ioctl_xfs_getresblks.2*
+%{_mandir}/man2/ioctl_xfs_goingdown.2*
+%{_mandir}/man2/ioctl_xfs_inumbers.2*
 %{_mandir}/man2/ioctl_xfs_scrub_metadata.2*
+%{_mandir}/man2/ioctl_xfs_setresblks.2*
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*