rpms/texi2html
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Unbundle libintl-perl

Browse Source
This commit is contained in:
Petr Písař 2014-10-22 10:44:22 +02:00
parent 48db905d41
commit 1d0e23e08b
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
texi2html-5.0-Do-not-install-libintl-perl-if-external-is-used.patch Normal file
View File

@ -0,0 +1,48 @@
From 68e345ada811cdea2d9ccf056001e15f6e2316a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 22 Oct 2014 10:30:16 +0200
Subject: [PATCH] Do not install libintl-perl if external is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Configuration --with-external-libintl-perl=yes should not
install the bundled libintl-perl code. This patch fixes it.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Makefile.am | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bc3257b..37dfd0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,14 +259,16 @@ distclean-local:
install-data-local: i18n
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n
$(INSTALL_DATA) i18n/*.thl $(DESTDIR)$(pkgdatadir)/i18n
- $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
- $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
- $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
- $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
- $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
- $(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
+ if test '$(USE_EXTERNAL_LIBINTL)' != 'yes'; then \
+ $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
+ $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData ;\
+ $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
+ $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale ; \
+ $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
+ $(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 ; \
+ fi
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 \
--
1.9.3

17
texi2html.spec
View File

@ -11,19 +11,23 @@ Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}
# 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
# Do not install bundled libintl-perl, <https://savannah.nongnu.org/bugs/?43457>
Patch1: texi2html-5.0-Do-not-install-libintl-perl-if-external-is-used.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
# autotools for the unbundling patches
BuildRequires: autoconf automake
BuildRequires: latex2html tetex-tex4ht gettext
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Locale::Messages)
BuildRequires: perl(Text::Unidecode)
BuildRequires: perl(Unicode::EastAsianWidth)
# not detected automatically because it is required at runtime based on
# user configuration
Requires: perl(Locale::Messages)
Requires: perl(Text::Unidecode)
Requires: perl(Unicode::EastAsianWidth)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -38,15 +42,17 @@ 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
%patch1 -p1
# Remove bundled modules
rm -r lib
# Regenerate build script because of the patch
aclocal -I m4
automake --add-missing
autoconf
%build
%configure --with-external-Unicode-EastAsianWidth=yes
%configure --with-external-libintl-perl=yes \
--with-external-Unicode-EastAsianWidth=yes
make %{?_smp_mflags}
%install
@ -87,14 +93,13 @@ fi
%{_datadir}/%{name}/i18n/*
%dir %{_datadir}/%{name}/images/
%{_datadir}/%{name}/images/*
%dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/lib/*
%dir %{_datadir}/texinfo
%dir %{_sysconfdir}/texinfo
%changelog
* Wed Oct 22 2014 Petr Pisar <ppisar@redhat.com> - 5.0-2
- Unbundle Unicode-EastAsianWidth (bug #1154436)
- Unbundle libintl-perl
* Mon Sep 08 2014 Phil Knirsch <pknirsch@redhat.com> - 5.0-1
- Update to texi2html-5.0 (#820697)