[packages/e2fsprogs] up to 1.46.1

[atler]

commit 30776257c8c9032fabe631bf77fdfe4fc87dd6be
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 10 18:46:07 2021 +0100

    up to 1.46.1

 e2fsprogs-diet.patch             |  2 +-
 e2fsprogs-gettext-external.patch | 32 --------------------------------
 e2fsprogs.spec                   | 12 ++++--------
 3 files changed, 5 insertions(+), 41 deletions(-)
---
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index bd5ebb8..5c6a108 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -51,18 +51,17 @@ Summary(uk.UTF-8):	Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.45.6
+Version:	1.46.1
 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:	cccfb706d162514e4f9dbfbc9e5d65ee
+# Source0-md5:	8c52585522b7ca6bdae2bdecba27b3a4
 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:	automake
@@ -642,7 +641,6 @@ na potrzeby initrd.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -700,8 +698,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' \
diff --git a/e2fsprogs-diet.patch b/e2fsprogs-diet.patch
index 6a7403c..da3e4cf 100644
--- a/e2fsprogs-diet.patch
+++ b/e2fsprogs-diet.patch
@@ -3,7 +3,7 @@
 @@ -69,7 +69,6 @@
  WITH_DIET_LIBC=
  AC_ARG_WITH([diet-libc],
- [  --with-diet-libc        use diet libc],
+ AS_HELP_STRING([--with-diet-libc],[use diet libc]),
 -CC="diet cc -nostdinc"
  WITH_DIET_LIBC=yes
  if test -z "$LIBS"
diff --git a/e2fsprogs-gettext-external.patch b/e2fsprogs-gettext-external.patch
deleted file mode 100644
index 5d8cf2e..0000000
--- a/e2fsprogs-gettext-external.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- e2fsprogs-1.45.3/configure.ac.orig	2019-07-16 18:18:01.489838520 +0200
-+++ e2fsprogs-1.45.3/configure.ac	2019-07-16 18:55:50.620878916 +0200
-@@ -872,7 +872,7 @@
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- 
--AM_GNU_GETTEXT
-+AM_GNU_GETTEXT([external])
- dnl
- dnl End of configuration options
- dnl
-@@ -1581,9 +1581,6 @@
- if test -n "$CPPFLAGS" ; then
- 	INCLUDES="$INCLUDES $CPPFLAGS"
- fi
--if test "$USE_INCLUDED_LIBINTL" = "yes" ; then
--	INCLUDES=$INCLUDES' -I$(top_builddir)/intl -I$(top_srcdir)/intl'
--fi
- if test -n "$WITH_DIET_LIBC" ; then
- 	INCLUDES="$INCLUDES -D_REENTRANT"
- fi
---- e2fsprogs-1.45.3/Makefile.in.orig	2019-07-15 03:03:14.000000000 +0200
-+++ e2fsprogs-1.45.3/Makefile.in	2019-07-16 18:58:17.380083853 +0200
-@@ -19,7 +19,7 @@
- @ALL_CMT at EXT2FS_LIB_SUBDIR= lib/ext2fs
- 
- LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
--	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
-+	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
- 
- PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
- 	$(E2SCRUB_DIR)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/e2fsprogs.git/commitdiff/5a5814f3eadc8957df1ace41b2df1978e1621f82