Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2019-06-12 13:06:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "e2fsprogs" Wed Jun 12 13:06:18 2019 rev:106 rq:706657 version:1.45.2 Changes: -------- --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2019-05-21 10:19:41.163632524 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.4811/e2fsprogs.changes 2019-06-12 13:06:20.369182557 +0200 @@ -1,0 +2,15 @@ +Fri May 31 10:42:41 UTC 2019 - Jan Kara <[email protected]> + +- Package e2scrub unit files and separate scrubbing bits into a separate + subpackage e2fsprogs-scrub + +------------------------------------------------------------------- +Fri May 31 03:50:23 UTC 2019 - [email protected] + +- Update to 1.45.2 + * Fixed e2scrub_all issues running from cron + * When mke2fs asks to proceed, fall back on English Y/y + * Fix spurious complaint of blocks beyond i_size + * Fixed 'make install' failure when the cron.d dir doesn't exist + +------------------------------------------------------------------- Old: ---- e2fsprogs-1.45.1.tar.xz New: ---- e2fsprogs-1.45.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.3saaMW/_old 2019-06-12 13:06:21.185182214 +0200 +++ /var/tmp/diff_new_pack.3saaMW/_new 2019-06-12 13:06:21.189182212 +0200 @@ -23,6 +23,11 @@ # Hint for ZYPP Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4) %endif +%if 0%{?suse_version} >= 1210 +%bcond_without systemd +%else +%bcond_with systemd +%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel @@ -62,7 +67,7 @@ Conflicts: libcom_err-mini-devel %endif # -Version: 1.45.1 +Version: 1.45.2 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0-only @@ -71,6 +76,7 @@ Requires(post): coreutils Requires: libcom_err2 >= %{version} Requires: libext2fs2 >= %{version} +Suggests: e2fsprogs-scrub Source: http://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz Source2: README.SUSE Source3: baselibs.conf @@ -106,6 +112,27 @@ Dummy development package for backwards compatibility. %if %{build_mini} +%package -n e2fsprogs-scrub-mini +%else +%package -n e2fsprogs-scrub +%endif +Summary: Ext2fs scrubbing scripts and service files +License: GPL-2.0-only +Group: System/Filesystems +%if %{with systemd} +BuildRequires: systemd-rpm-macros +%{?systemd_requires} +%endif +Requires: e2fsprogs +Requires: lvm2 +Requires: postfix +Requires: util-linux + +%description -n e2fsprogs-scrub +Scripts and systemd service files for background scrubbing of LVM volumes +with ext2, ext3, and ext4 filesystems. + +%if %{build_mini} %package -n libext2fs2-mini %else %package -n libext2fs2 @@ -228,15 +255,14 @@ %build autoreconf --force --install %configure \ - --disable-evms \ --with-root-prefix='' \ --enable-elf-shlibs \ --disable-libblkid \ --disable-libuuid \ --disable-uuidd \ --disable-fsck \ - --enable-static \ --without-crond-dir \ + --with-systemd-unit-dir=%{?_unitdir} \ CFLAGS="$RPM_OPT_FLAGS" %if %{build_mini} rm -rf doc @@ -280,6 +306,16 @@ do ln -s %{_libdir}/$libName %{buildroot}/%{_lib}; done #EndUsrMerge + +%if %{with systemd} +%if %{build_mini} +%pre -n e2fsprogs-scrub-mini +%else +%pre -n e2fsprogs-scrub +%endif +%service_add_pre [email protected] e2scrub_all.service e2scrub_all.timer [email protected] e2scrub_reap.service +%endif + %post /sbin/ldconfig %if ! %{build_mini} @@ -287,6 +323,24 @@ %{?regenerate_initrd_post} %endif +%if %{with systemd} +%if %{build_mini} +%post -n e2fsprogs-scrub-mini +%else +%post -n e2fsprogs-scrub +%endif +%service_add_post [email protected] e2scrub_all.service e2scrub_all.timer [email protected] e2scrub_reap.service +%endif + +%if %{with systemd} +%if %{build_mini} +%preun -n e2fsprogs-scrub-mini +%else +%preun -n e2fsprogs-scrub +%endif +%service_del_preun [email protected] e2scrub_all.service e2scrub_all.timer [email protected] e2scrub_reap.service +%endif + %postun /sbin/ldconfig %if ! %{build_mini} @@ -294,6 +348,15 @@ %{?regenerate_initrd_post} %endif +%if %{with systemd} +%if %{build_mini} +%postun -n e2fsprogs-scrub-mini +%else +%postun -n e2fsprogs-scrub +%endif +%service_del_postun [email protected] e2scrub_all.service e2scrub_all.timer [email protected] e2scrub_reap.service +%endif + %if ! %{build_mini} %posttrans %{?regenerate_initrd_posttrans} @@ -330,7 +393,6 @@ %license NOTICE %endif %config /etc/mke2fs.conf -%config /etc/e2scrub.conf #UsrMerge /sbin/badblocks /sbin/debugfs @@ -376,8 +438,6 @@ %{_sbindir}/e2freefrag %{_sbindir}/e4defrag %{_sbindir}/e4crypt -%{_sbindir}/e2scrub -%{_sbindir}/e2scrub_all %if ! %{build_mini} %{_infodir}/libext2fs.info.gz %endif @@ -393,6 +453,25 @@ %doc README.SUSE %if %{build_mini} +%files -n e2fsprogs-scrub-mini +%else +%files -n e2fsprogs-scrub +%endif +%defattr(-,root,root) +%config /etc/e2scrub.conf +%{_sbindir}/e2scrub +%{_sbindir}/e2scrub_all +%if %{with systemd} +%{_libdir}/e2fsprogs/ +%{_libdir}/e2fsprogs/e2scrub_fail +%{_unitdir}/[email protected] +%{_unitdir}/e2scrub_all.service +%{_unitdir}/e2scrub_all.timer +%{_unitdir}/[email protected] +%{_unitdir}/e2scrub_reap.service +%endif + +%if %{build_mini} %files -n libext2fs2-mini %else %files -n libext2fs2 ++++++ e2fsprogs-1.45.1.tar.xz -> e2fsprogs-1.45.2.tar.xz ++++++ ++++ 49780 lines of diff (skipped)
