[texi2html] Unbundle Unicode-EastAsianWidth

[Petr Pisar]

commit 48db905d41af5598ef0934449fcec3003c41c149
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Oct 22 10:16:03 2014 +0200

    Unbundle Unicode-EastAsianWidth

 ...all-Unicode-EastAsianWidth-if-external-is.patch |   38 ++++++++++++++++++++
 texi2html.spec                                     |   24 +++++++++++--
 2 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/texi2html-5.0-Do-not-install-Unicode-EastAsianWidth-if-external-is.patch b/texi2html-5.0-Do-not-install-Unicode-EastAsianWidth-if-external-is.patch
new file mode 100644
index 0000000..a2b7eb9
--- /dev/null
+++ b/texi2html-5.0-Do-not-install-Unicode-EastAsianWidth-if-external-is.patch
@@ -0,0 +1,38 @@
+From 91a0efcf09a95c0a3e74ca4e1d6225a860e010d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 22 Oct 2014 09:43:25 +0200
+Subject: [PATCH] Do not install Unicode-EastAsianWidth if external is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Configuration --with-external-Unicode-EastAsianWidth=yes should not
+install the bundled Unicode-EastAsianWidth code. This patch fixes it.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.am | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3447463..bc3257b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -267,9 +267,11 @@ install-data-local: i18n
+ 	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
+ 	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
+ 	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+-	$(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
+-	 $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
++	if test '$(USE_EXTERNAL_EASTASIANWIDTH)' != 'yes'; then \
++	  $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \
++	  $(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
++	    $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \
++	fi
+ 
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(pkgdatadir)/lib/ $(DESTDIR)$(pkgdatadir)/i18n
+-- 
+1.9.3
+
diff --git a/texi2html.spec b/texi2html.spec
index 2389cae..757e865 100644
--- a/texi2html.spec
+++ b/texi2html.spec
@@ -1,6 +1,6 @@
 Name: texi2html
 Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLv2+ is for the code
 # OFSFDL (Old FSF Documentation License) for the documentation
 # CC-BY-SA or GPLv2 for the images
@@ -8,16 +8,24 @@ License: GPLv2+ and OFSFDL and (CC-BY-SA or GPLv2)
 Group: Applications/Text
 Summary: A highly customizable texinfo to HTML and other formats translator
 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
+# Do not install bundled Unicode-EastAsianWidth, bug #1154436,
+# <https://savannah.nongnu.org/bugs/?43456>
+Patch0: texi2html-5.0-Do-not-install-Unicode-EastAsianWidth-if-external-is.patch
 URL: http://www.nongnu.org/texi2html/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: perl >= 5.004
 Requires: latex2html
+# autotools for the Do-not-install-Unicode-EastAsianWidth-if-external-is.patch
+BuildRequires: autoconf automake
 BuildRequires: latex2html tetex-tex4ht gettext
-BuildRequires: perl(Data::Dumper) perl(Text::Unidecode)
+BuildRequires: perl(Data::Dumper)
+BuildRequires: perl(Text::Unidecode)
+BuildRequires: perl(Unicode::EastAsianWidth)
 # not detected automatically because it is required at runtime based on
 # user configuration
 Requires: perl(Text::Unidecode)
+Requires: perl(Unicode::EastAsianWidth)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -29,9 +37,16 @@ output not specified in the Texinfo input file to be specified.
 
 %prep
 %setup -q
+%patch0 -p1
+# Remove bundled Unicode-EastAsianWidth
+rm -r lib/Unicode-EastAsianWidth
+# Regenerate build script because of the patch
+aclocal -I m4
+automake --add-missing
+autoconf
 
 %build
-%configure
+%configure --with-external-Unicode-EastAsianWidth=yes
 make %{?_smp_mflags}
 
 %install
@@ -78,6 +93,9 @@ fi
 %dir %{_sysconfdir}/texinfo
 
 %changelog
+* Wed Oct 22 2014 Petr Pisar <ppisar at redhat.com> - 5.0-2
+- Unbundle Unicode-EastAsianWidth (bug #1154436)
+
 * Mon Sep 08 2014 Phil Knirsch <pknirsch at redhat.com> - 5.0-1
 - Update to texi2html-5.0 (#820697)