X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs.spec;h=8f96f4a119fc9b1a8e10f2276438d99addc9b49c;hb=1467f6301d9abfb9baccc68fce27dbfe16992ee0;hp=e63363fb2c621deba7defd4996908924778424a2;hpb=bba2b36866c33654291d4744307f7afada290616;p=packages%2Fxfsprogs.git

diff --git a/xfsprogs.spec b/xfsprogs.spec
index e63363f..8f96f4a 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,39 +1,37 @@
 #
 # Conditional build:
-%bcond_without	tcmalloc	# don't use tcmalloc
-
-%ifarch x32
-%undefine	with_tcmalloc
-%endif
-
+%bcond_without	debug_asserts
+#
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	4.2.0
+Version:	4.20.0
 Release:	1
 License:	LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:		Applications/System
-Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-# Source0-md5:	e1b9438d3e6775b9df52cc9a13e9f9a6
+Source0:	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.gz
+# Source0-md5:	449e475ff861a184606c7d1500de7fb6
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
 Patch1:		%{name}-pl.po-update.patch
-Patch2:		%{name}-noquotasync.patch
+# Patch1-md5:	28832d2c0aefb92ec17ebfe924c156e3
+Patch2:		xfsprogs-small_fixes.patch
 URL:		http://www.xfs.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bash
+BuildRequires:	device-mapper-devel
 BuildRequires:	gettext-tools
 BuildRequires:	glibc-static
 BuildRequires:	libblkid-devel
-%{?with_tcmalloc:BuildRequires:	libtcmalloc-devel}
+BuildRequires:	libicu-devel
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	libuuid-static
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.402
-%{?with_tcmalloc:Requires:	libtcmalloc >= 1.8.3-3}
+BuildRequires:	sed >= 4.0
 Obsoletes:	xfsprogs-initrd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,11 +40,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		filterout_ld -Wl,--as-needed
 %endif
 
-%define		_sbindir	/sbin
-%define		_bindir		/usr/sbin
-%define		_libdir		/%{_lib}
-%define		_libexecdir	/usr/%{_lib}
-
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
 
@@ -69,6 +62,24 @@ obsługujący wielkie pliki oraz wielkie systemy, o rozszerzonych
 atrybutach, zmiennych wielkościach bloków, mocno wykorzystujący
 B-drzewa by uzyskać wysoką wydajność oraz skalowalność.
 
+%package scrub
+Summary:	xfs_scrub - XFS online check and repair feature (EXPERIMENTAL!)
+Summary(pl.UTF-8):	xfs_scrub - sprawdzanie i naprawianie zamontowanego systemu plików XFS (EKSPERYMENTALNE!)
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	systemd-units >= 38
+
+%description scrub
+xfs_scrub is an XFS online check and repair feature.
+
+WARNING: EXPERIMENTAL, use at your own risk!
+
+%description scrub -l pl.UTF-8
+xfs_scrub służy do sprawdzania i naprawiania zamontowanego systmeu
+plików XFS w locie.
+
+UWAGA: EXPERIMENTALNE, użycie na własne ryzyko!
+
 %package devel
 Summary:	Header files and libraries to develop XFS software
 Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteki
@@ -99,26 +110,30 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in tools/xfsbuflock.py
+
 %build
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
-	--sbindir=%{_bindir}\
+	DEBUG="%{?with_debug_asserts:-DDEBUG}%{!?with_debug_asserts:-DNDEBUG}" \
+	OPTIMIZER="%{rpmcflags}" \
+	--enable-libicu=yes \
+	--enable-lto=no \
+	--enable-blkid \
 	--enable-gettext \
 	--enable-readline \
-	--enable-blkid \
-	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags}"
+	--enable-scrub=yes
 
 %{__make} -j1 \
 	V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},/etc}
+install -d $RPM_BUILD_ROOT/etc/cron.d
 
 DIST_ROOT=$RPM_BUILD_ROOT
 DIST_INSTALL=$(pwd)/install.manifest
@@ -130,26 +145,27 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
 %{__make} install-dev \
 	DIST_MANIFEST="$DIST_INSTALL_DEV"
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xfs_lsprojid
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/xfs_lsprojid
 
-ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
-	 $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
-
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
+# adjust symlink to point to actual library, not libhandle.so symlink, which we remove afterwards
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*) \
+	 $RPM_BUILD_ROOT%{_libdir}/libhandle.so
+# adjust library path used at link time
+%{__sed} -i -e "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" \
+	$RPM_BUILD_ROOT%{_libdir}/libhandle.la
+# already in /usr
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libhandle.{so,la,a}
 
-%{__sed} -i -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
-	$RPM_BUILD_ROOT%{_libexecdir}/libhandle.la
+# install cron file
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{name}/xfs_scrub_all.cron,/etc/cron.d/xfs_scrub_all}
 
+# (config file paths are specified in libfrog/projects.c)
 echo "#10:/mnt/ftp/roman"  >> $RPM_BUILD_ROOT/etc/projects
 echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
 
-%find_lang %{name}
-
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
-# already in /usr
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhandle.so
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -157,32 +173,52 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post scrub
+%systemd_reload
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README doc/{CHANGES,CREDITS}
 %config(noreplace) %verify(not md5 mtime size) /etc/projects
 %config(noreplace) %verify(not md5 mtime size) /etc/projid
-%attr(755,root,root) %{_sbindir}/fsck.xfs
-%attr(755,root,root) %{_sbindir}/mkfs.xfs
-%attr(755,root,root) %{_sbindir}/xfs_repair
-%attr(755,root,root) %{_bindir}/xfs_*
-%attr(755,root,root) %{_libdir}/libhandle.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhandle.so.1
+%attr(755,root,root) /sbin/fsck.xfs
+%attr(755,root,root) /sbin/mkfs.xfs
+%attr(755,root,root) /sbin/xfs_repair
+%attr(755,root,root) %{_sbindir}/xfs_*
+%exclude %{_sbindir}/xfs_scrub*
+%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
 %{_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*
+%exclude %{_mandir}/man8/xfs_scrub*.8*
+
+%files scrub
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/xfs_scrub
+%attr(755,root,root) %{_sbindir}/xfs_scrub_all
+%{systemdunitdir}/xfs_scrub@.service
+%{systemdunitdir}/xfs_scrub_all.service
+%{systemdunitdir}/xfs_scrub_all.timer
+%{systemdunitdir}/xfs_scrub_fail@.service
+%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/xfs_scrub_all
+%{_mandir}/man8/xfs_scrub.8*
+%{_mandir}/man8/xfs_scrub_all.8*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/libhandle.so
-%{_libexecdir}/libhandle.la
+%attr(755,root,root) %{_libdir}/libhandle.so
+%{_libdir}/libhandle.la
 %{_includedir}/xfs
+%{_mandir}/man2/ioctl_xfs_scrub_metadata.2*
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/libhandle.a
+%{_libdir}/libhandle.a