Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2019-08-05 11:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "e2fsprogs" Mon Aug 5 11:18:20 2019 rev:108 rq:718774 version:1.45.2 Changes: -------- --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2019-07-08 15:09:56.627282841 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new.4126/e2fsprogs.changes 2019-08-05 11:18:23.202510917 +0200 @@ -1,0 +2,8 @@ +Wed Jul 24 20:47:22 UTC 2019 - Antoine Belvire <[email protected]> + +- Fix build with gettext 0.20: + * Add e2fsprogs-1.45.2-gettext.patch. + * Exclude in-sources intl/ directory from build. +- Fix install_info_delete usage: It must be called in preun. + +------------------------------------------------------------------- New: ---- e2fsprogs-1.45.2-gettext.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.vUKyC1/_old 2019-08-05 11:18:23.786510678 +0200 +++ /var/tmp/diff_new_pack.vUKyC1/_new 2019-08-05 11:18:23.786510678 +0200 @@ -44,7 +44,8 @@ %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 @@ 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 @@ %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 @@ %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 [email protected] e2scrub_all.service e2scrub_all.timer [email protected] e2scrub_reap.service @@ -345,7 +353,6 @@ %postun /sbin/ldconfig %if ! %{build_mini} -%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz || : %{?regenerate_initrd_post} %endif ++++++ e2fsprogs-1.45.2-gettext.patch ++++++ 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
