Accepting request 718436 from home:1Antoine1:branches:filesystems

- Fix build with gettext 0.20:
  * Add e2fsprogs-1.43-gettext.patch.
  * Exclude in-sources intl/ directory from build.
- Fix install_info_delete usage: It must be called in preun.

OBS-URL: https://build.opensuse.org/request/show/718436
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=116

e2fsprogs-1.45.2-gettext.patch

@@ -0,0 +1,20 @@
+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.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 20:47:22 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Fix build with gettext 0.20:
+  * Add e2fsprogs-1.43-gettext.patch.
+  * Exclude in-sources intl/ directory from build.
+- Fix install_info_delete usage: It must be called in preun.
+
 -------------------------------------------------------------------
 Tue Jul  2 07:28:56 UTC 2019 - Martin Liška <mliska@suse.cz>
 

e2fsprogs.spec

@@ -44,7 +44,8 @@ BuildRequires:  makeinfo
 %define install_info sbin/install-info
 %define install_info_delete sbin/install-info --delete
 %endif
-Requires:       %install_info_prereq
+Requires(post): %install_info_prereq
+Requires(preun): %install_info_prereq
 %endif
 # bug437293
 %ifarch ppc64
@@ -87,6 +88,8 @@ Source3:        baselibs.conf
 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
 
@@ -250,7 +253,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
@@ -337,6 +343,8 @@ done
 %if %{build_mini}
 %preun -n e2fsprogs-scrub-mini
 %else
+%preun
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || :
 %preun -n e2fsprogs-scrub
 %endif
 %service_del_preun e2scrub@.service e2scrub_all.service e2scrub_all.timer e2scrub_fail@.service e2scrub_reap.service
@@ -345,7 +353,6 @@ done
 %postun
 /sbin/ldconfig
 %if ! %{build_mini}
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || :
 %{?regenerate_initrd_post}
 %endif