- added gettext-external patch (needed for compatibility with gettext 0.20)

diff --git a/e2fsprogs-gettext-external.patch b/e2fsprogs-gettext-external.patch
new file mode 100644 (file)
index 0000000..5d8cf2e
--- /dev/null
+++ b/e2fsprogs-gettext-external.patch
@@ -0,0 +1,32 @@
+--- 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@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)

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 09e1e77fbf26f79782d32274e129341508207a0f..4dd9e3751a72d547ff32b00f758b8f5983d55b0d 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -60,6 +60,7 @@ Source0:      http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
 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
 URL:           http://e2fsprogs.sourceforge.net/
@@ -639,6 +640,7 @@ na potrzeby initrd.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1