Accepting request 873456 from filesystems

OBS-URL: https://build.opensuse.org/request/show/873456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=115

e2fsprogs-1.45.2-gettext.patch

@@ -1,20 +0,0 @@
-Support gettext >= 0.20, which now forbids AM_GNU_GETTEXT without
-intlsymbol argument.
-
-[no-libtool] was the default choice (use of intl/ in-package
-directory).
-
-Now only [external] is supported (use libintl library).
---
-diff -up e2fsprogs-1.45.2/configure.ac.orig e2fsprogs-1.45.2/configure.ac
---- e2fsprogs-1.45.2/configure.ac.orig
-+++ e2fsprogs-1.45.2/configure.ac
-@@ -873,7 +873,7 @@ AC_SUBST(GETTEXT_PACKAGE)
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- 
--AM_GNU_GETTEXT
-+AM_GNU_GETTEXT([external])
- dnl
- dnl End of configuration options
- dnl

e2fsprogs-1.45.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256
-size 5572144

e2fsprogs-1.46.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbe6af3b7bb7119556b6f57a78d41b330007738bca8530b2ba95d2ba35430151
+size 7019700

e2fsprogs.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Feb 18 14:44:00 UTC 2021 - Jan Kara <jack@suse.cz>
+
+- Remove autoreconf (and resulting dependencies) from the spec file. The
+  upstream configure script should be fine.
+
+-------------------------------------------------------------------
+Tue Feb 16 17:31:25 UTC 2021 - Jan Kara <jack@suse.cz>
+
+- Update to 1.46.1:
+  * Fix setting extended attributes in libext2fs and debugfs
+  * Fix e2fsck to accept large_dir directories greater than 4G
+  * Fix fast commit support on big endian architectures
+  * Fix mke2fs -d to correctly import a small file stored using inline_data
+    feature and which has ACL or extended attribute
+  * Various compilation fixes
+  * Speedup bitmap loading for large filesystems using multiple threads
+  * Speedup mke2fs for bigalloc filesystems
+  * E2fsck fixes when rehashing directories
+  * Fix e2fsck crashes on maliciously corrupted filesystems
+  * Fix e2fsck handling of duplicated case-folded file names
+  * Implement hashed directory support in libext2fs
+  * Support for fast commit feature
+  * Support for combination of casefolding and encryption
+  * Support for stable inodes feature
+  * Add support for per-inode DAX flag
+  * Fix tune2fs to unlock MMP on failure
+  * Fix e2fsck buffer overflow when scanning directory blocks
+  * Fix resize2fs overflowing block group descriptors with 1k block size
+- delete e2fsprogs-1.45.2-gettext.patch - it was merged upstream
+- Add autoconf-archive to build requirements
+- Fix installation of info files for older distros
+
 -------------------------------------------------------------------
 Thu Jan 28 15:02:08 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
 

e2fsprogs.spec

@@ -28,8 +28,6 @@ Supplements:    filesystem(ext2) filesystem(ext3) filesystem(ext4)
 %else
 %bcond_with systemd
 %endif
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  libblkid-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  pkg-config
@@ -68,7 +66,7 @@ Conflicts:      libcom_err2-mini
 Conflicts:      libcom_err-mini-devel
 %endif
 #
-Version:        1.45.6
+Version:        1.46.1
 Release:        0
 Summary:        Utilities for the Second Extended File System
 License:        GPL-2.0-only
@@ -91,8 +89,6 @@ Source5:        https://thunk.org/tytso/tytso-key.asc#/%{name}.keyring
 Patch3:         libcom_err-compile_et_permissions.patch
 Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
 Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
-# PATCH-FIX-UPSTREAM e2fsprogs-1.45.2-gettext.patch -- Support gettext 0.20
-Patch6:         e2fsprogs-1.45.2-gettext.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -256,14 +252,10 @@ Development files for the com_err error message display library. Static librarie
 %patch3 -p1
 %patch4
 %patch5
-%patch6 -p1
 cp %{SOURCE2} .
-# Don't use intl/ subdirectory as it's deprecated since gettext 0.20
-rm -r intl
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-autoreconf --force --install
 %configure \
   --with-root-prefix=''   \
   --enable-elf-shlibs \
@@ -329,7 +321,9 @@ done
 %post
 /sbin/ldconfig
 %if ! %{build_mini}
-%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || :
+%if 0%{?suse_version} <= 1530
+%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+%endif
 %{?regenerate_initrd_post}
 %endif
 
@@ -347,7 +341,9 @@ done
 %preun -n e2fsprogs-scrub-mini
 %else
 %preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || :
+%if 0%{?suse_version} <= 1530
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+%endif
 %preun -n e2fsprogs-scrub
 %endif
 %service_del_preun e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service