From 1bc7d7b13543a482db2fa0b3d43f0f7671401c5aa01d7c9610edce0c8b5888aa Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 15 Jul 2019 01:08:54 +0000 Subject: [PATCH] Accepting request 715314 from home:benoit_monin:branches:Base:System - add lrzsz-0.12.21rc-drop-po-intl.patch: fix build with gettext >= 0.20 - generate and install translation file manually OBS-URL: https://build.opensuse.org/request/show/715314 OBS-URL: https://build.opensuse.org/package/show/Base:System/rzsz?expand=0&rev=28 --- lrzsz-0.12.21rc-drop-po-intl.patch | 30 ++++++++++++++++++++++++++++++ rzsz.changes | 7 +++++++ rzsz.spec | 13 ++++++++++--- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 lrzsz-0.12.21rc-drop-po-intl.patch diff --git a/lrzsz-0.12.21rc-drop-po-intl.patch b/lrzsz-0.12.21rc-drop-po-intl.patch new file mode 100644 index 0000000..bc05c9f --- /dev/null +++ b/lrzsz-0.12.21rc-drop-po-intl.patch @@ -0,0 +1,30 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = lib intl src po man testsuite ++SUBDIRS = lib src man testsuite + EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \ + README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \ + beos-runpiped.c fastcheck.beos +--- a/Makefile.in ++++ b/Makefile.in +@@ -92,7 +92,7 @@ USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + l = @l@ + +-SUBDIRS = lib intl src po man testsuite ++SUBDIRS = lib src man testsuite + EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests beos-runpiped.c fastcheck.beos + + noinst_SCRIPTS = systype +--- a/configure.in ++++ b/configure.in +@@ -107,7 +107,7 @@ dnl AC_PROG_MAKE_SET included in AM_INIT + AC_PROG_RANLIB + AC_ISC_POSIX + AC_USE_SYSTEM_EXTENSIONS +-AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + AC_C_CONST + AC_C_INLINE + diff --git a/rzsz.changes b/rzsz.changes index 6b334b8..29b9de7 100644 --- a/rzsz.changes +++ b/rzsz.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 9 20:10:36 UTC 2019 - BenoƮt Monin + +- add lrzsz-0.12.21rc-drop-po-intl.patch: + fix build with gettext >= 0.20 +- generate and install translation file manually + ------------------------------------------------------------------- Thu Apr 5 07:51:03 UTC 2018 - tchvatal@suse.com diff --git a/rzsz.spec b/rzsz.spec index 8be35ed..71d53a1 100644 --- a/rzsz.spec +++ b/rzsz.spec @@ -1,7 +1,7 @@ # # spec file for package rzsz # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,6 +34,7 @@ Patch7: lrzsz-0.12.20-automake-1.13.patch Patch8: lrzsz-0.12.20-null-pointer.patch # PATCH-FIX-UPSTREAM fix getopt optstring boo#1076576 Patch9: lrzsz-0.12.20-fix-lsz-getopt.patch +Patch10: lrzsz-0.12.21rc-drop-po-intl.patch BuildRequires: autoconf BuildRequires: automake Provides: lrzsz @@ -52,6 +53,7 @@ system. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Missing file >> config.rpath @@ -60,14 +62,19 @@ rm -f missing # Broken header rm -f acconfig.h - %build autoreconf -fvi %configure make %{?_smp_mflags} +# generate translation +msgfmt -o po/de.mo po/de.po %install %make_install + +# install translation +mkdir -p "%{buildroot}/%{_datarootdir}/locale/de/LC_MESSAGES" +cp po/de.mo "%{buildroot}/%{_datarootdir}/locale/de/LC_MESSAGES/lrzsz.mo" %find_lang lrzsz # Fix various symlinks