From 0057755ac996c2d321c8c2b578895275e50c9636b842c7f27ccc31b8b921a3c6 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 19 Oct 2020 05:49:46 +0000 Subject: [PATCH] Accepting request 842328 from home:dstoecker - Fix wrong perl provides for Unicode::EastAsianWidth This package states to provide a perl package which it in reality does not. That makes using that package very complicated. This fixes solves this together with the request for the perl package. perl package: https://build.opensuse.org/request/show/842326 OBS-URL: https://build.opensuse.org/request/show/842328 OBS-URL: https://build.opensuse.org/package/show/Publishing/texi2html?expand=0&rev=20 --- texi2html.changes | 6 +++++- texi2html.spec | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/texi2html.changes b/texi2html.changes index 35ddbcc..0157f35 100644 --- a/texi2html.changes +++ b/texi2html.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 17 20:11:10 UTC 2020 - Dirk Stoecker + +- Fix wrong perl provides for Unicode::EastAsianWidth + ------------------------------------------------------------------- Sat May 6 13:51:15 UTC 2017 - bwiedemann@suse.com @@ -53,4 +58,3 @@ Thu Aug 7 18:59:42 UTC 2014 - dmitry_r@opensuse.org - Import: * texi2html-1.78.dif * config-guess-sub-update.patch - diff --git a/texi2html.spec b/texi2html.spec index d04eab4..8734a30 100644 --- a/texi2html.spec +++ b/texi2html.spec @@ -1,7 +1,7 @@ # # spec file for package texi2html # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # 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/ # @@ -20,9 +20,9 @@ Name: texi2html Version: 5.0 Release: 0 Summary: Tool for converting texinfo documents to HTML -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Publishing/Texinfo -Url: http://www.nongnu.org/texi2html/ +URL: http://www.nongnu.org/texi2html/ Source0: http://download.savannah.nongnu.org/releases/texi2html/texi2html-%{version}.tar.bz2 Patch1: texi2html-1.78.dif Patch2: texi2html-5584.patch @@ -31,9 +31,11 @@ BuildRequires: perl BuildRequires: perl-Text-Unidecode BuildRequires: perl-gettext BuildRequires: perl-libintl-perl +BuildRequires: perl(Unicode::EastAsianWidth) Requires: perl-Text-Unidecode Requires: perl-gettext Requires: perl-libintl-perl +Requires: perl(Unicode::EastAsianWidth) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Conflicts: texinfo < 5.0 @@ -63,7 +65,13 @@ touch translations.pl LANG=POSIX LC_ALL=POSIX export LANG LC_ALL -%configure --enable-nls --with-encode --with-gnu-ld --with-unidecode --with-external-libintl-perl +%configure \ + --enable-nls \ + --with-encode \ + --with-gnu-ld \ + --with-unidecode \ + --with-external-libintl-perl \ + --with-external-Unicode-EastAsianWidth make %{?_smp_mflags} @@ -71,7 +79,7 @@ make %{?_smp_mflags} %make_install rm -rf %{buildroot}%{_datadir}/texinfo/ rm -rf %{buildroot}%{_datadir}/locale/*.us-ascii -rm -rf %{buildroot}%{_datadir}/%{name}/lib/libintl-perl/ +rm -rf %{buildroot}%{_datadir}/%{name}/lib %find_lang %name %find_lang %{name}_document