X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxfsprogs.git;a=blobdiff_plain;f=xfsprogs.spec;h=97d5496d028d2e0178c2f9301010dc92c41cabbd;hp=1c244cb7cc8474281923207522bf3519567aa4fd;hb=HEAD;hpb=4cf17b4de1c3292c21d531d0597c30bd6fe59c17

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 1c244cb..e648dfd 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,24 +1,25 @@
 #
 # Conditional build:
 %bcond_without	debug_asserts
+%bcond_without	scrub
+%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:	5.10.0
+Version:	6.7.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:	f4156af67a0e247833be88efaa2869f9
+# Source0-md5:	0bde7bc8b3d8cbbd01064f756f67911f
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
 Patch1:		%{name}-pl.po-update.patch
-# Patch1-md5:	1b41527cf19426d6059615c7d82b71e8
 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
+BuildRequires:	rpmbuild(macros) >= 1.527
+%{?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
@@ -115,7 +121,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
 
@@ -125,14 +138,15 @@ Biblioteki statyczne do XFS.
 %configure \
 	DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
 	OPTIMIZER="%{rpmcflags}" \
-	--enable-blkid \
 	--enable-editline \
 	--enable-gettext \
 	--enable-libicu \
 	--disable-lto \
-	--enable-scrub=yes
+	%{?with_scrub:--enable-scrub=yes} \
+	%{__enable_disable static_libs static} \
+	--with-udev-rule-dir=/lib/udev/rules.d
 
-%{__make} -j1 \
+%{__make} \
 	V=1
 
 %install
@@ -161,7 +175,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
@@ -189,23 +207,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}
+%if %{with scrub}
+%dir %{_libexecdir}/%{name}
+%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) %{_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
@@ -213,6 +240,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)
@@ -239,6 +267,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