From: Marcin Krol Date: Mon, 10 Jul 2023 11:15:40 +0000 (+0200) Subject: - allow building without scrub utilities X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe2fsprogs.git;a=commitdiff_plain;h=HEAD - allow building without scrub utilities --- diff --git a/e2fsprogs.spec b/e2fsprogs.spec index ab854eb..5efa2b4 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -8,6 +8,7 @@ %bcond_without fuse # fuse2fs program %bcond_without nls # build without NLS %bcond_without tls # TLS +%bcond_without scrub # don't package e2scrub* utilities %if "%{pld_release}" == "ac" %bcond_with initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc @@ -797,8 +798,10 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) /sbin/e2image %attr(755,root,root) /sbin/e2label %attr(755,root,root) /sbin/e2mmpstatus +%if %{with scrub} %attr(755,root,root) /sbin/e2scrub %attr(755,root,root) /sbin/e2scrub_all +%endif %attr(755,root,root) /sbin/e2undo %attr(755,root,root) /sbin/fsck.ext2 %attr(755,root,root) /sbin/fsck.ext3 @@ -818,18 +821,22 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_sbindir}/mklost+found %attr(755,root,root) %{_libdir}/e2initrd_helper %dir %{_libdir}/e2fsprogs +%if %{with scrub} %attr(755,root,root) %{_libdir}/e2fsprogs/e2scrub_all_cron %attr(755,root,root) %{_libdir}/e2fsprogs/e2scrub_fail %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/e2scrub_all -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2scrub.conf +%endif +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf +%if %{with scrub} %{systemdunitdir}/e2scrub@.service %{systemdunitdir}/e2scrub_all.service %{systemdunitdir}/e2scrub_all.timer %{systemdunitdir}/e2scrub_fail@.service %{systemdunitdir}/e2scrub_reap.service /lib/udev/rules.d/96-e2scrub.rules +%endif %{_mandir}/man1/chattr.1* %{_mandir}/man1/lsattr.1* %{_mandir}/man5/e2fsck.conf.5* @@ -845,8 +852,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/e2image.8* %{_mandir}/man8/e2label.8* %{_mandir}/man8/e2mmpstatus.8* +%if %{with scrub} %{_mandir}/man8/e2scrub.8* %{_mandir}/man8/e2scrub_all.8* +%endif %{_mandir}/man8/e2undo.8* %{_mandir}/man8/e4crypt.8* %{_mandir}/man8/e4defrag.8*