- allow building without scrub utilities

[packages/e2fsprogs.git] / e2fsprogs.spec

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 6b11b590dba8ffd4e021b2f978568213e4555b4d..5efa2b4a17c8c9f342dbbd29d91370f62ba6e33e 100644 (file)
--- 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
@@ -51,20 +52,20 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.45.4
-Release:       0.1
+Version:       1.47.0
+Release:       1
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
-Source0:       http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 2c2f9d4bcd0be54b3b3b8d5feec7b0ff
+Source0:       https://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
+# Source0-md5: 6b4f18a33873623041857b4963641ee9
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source2-md5: 992a37783bd42a897232972917e8ca7d
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-gettext-external.patch
-Patch2:                %{name}-498381.patch
-Patch3:                %{name}-diet.patch
+Patch1:                %{name}-498381.patch
+Patch2:                %{name}-diet.patch
 URL:           http://e2fsprogs.sourceforge.net/
-BuildRequires: autoconf >= 2.54
+BuildRequires: autoconf >= 2.71
+BuildRequires: autoconf-archive
 BuildRequires: automake
 BuildRequires: gettext-tools >= 0.11
 BuildRequires: libblkid-devel
@@ -72,7 +73,7 @@ BuildRequires:        libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.583
+BuildRequires: rpmbuild(macros) >= 1.644
 BuildRequires: texinfo
 BuildRequires: texinfo-texi2dvi
 %if %{with allstatic}
@@ -100,7 +101,7 @@ Requires:   fsck
 Requires:      libcom_err = %{version}-%{release}
 Requires:      libss = %{version}-%{release}
 Requires:      systemd-units >= 38
-Obsoletes:     e2fsprogs-evms
+Obsoletes:     e2fsprogs-evms < 1.36
 Obsoletes:     libext2fs2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -396,7 +397,7 @@ Requires:   libcom_err-devel = %{version}-%{release}
 Requires:      libuuid-devel
 Obsoletes:     libext2fs2-devel
 # until it comes back
-Obsoletes:     libquota-devel
+Obsoletes:     libquota-devel < 1.42.12
 
 %description devel
 e2fsprogs-devel contains the libraries and header files needed to
@@ -642,7 +643,6 @@ na potrzeby initrd.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -668,7 +668,7 @@ cp -f /usr/share/automake/config.sub .
        --disable-tls \
        --disable-uuidd
 
-%{__make} -j1 libs \
+%{__make} libs \
        V=1
 %{__make} progs \
        V=1
@@ -688,7 +688,7 @@ mv -f misc/mke2fs initrd-mke2fs
        --disable-uuidd \
        %{!?with_allstatic:--enable-elf-shlibs}
 
-%{__make} -j1 libs \
+%{__make} libs \
        LDFLAGS="%{rpmldflags}" \
        V=1
 %{__make} progs docs \
@@ -700,8 +700,6 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 export PATH=/sbin:$PATH
 
-echo "install-shlibs:" >> intl/Makefile
-
 %{__make} -j1 install install-libs \
        root_libdir=/%{_lib} \
        mkinstalldirs='install -d' \
@@ -800,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
@@ -821,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*
@@ -848,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*