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
This commit is contained in:
Martin Pluskal 2020-10-19 05:49:46 +00:00 committed by Git OBS Bridge
parent 3015b57fcf
commit 0057755ac9
2 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Oct 17 20:11:10 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>
- Fix wrong perl provides for Unicode::EastAsianWidth
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 6 13:51:15 UTC 2017 - bwiedemann@suse.com 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: - Import:
* texi2html-1.78.dif * texi2html-1.78.dif
* config-guess-sub-update.patch * config-guess-sub-update.patch

View File

@ -1,7 +1,7 @@
# #
# spec file for package texi2html # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Version: 5.0
Release: 0 Release: 0
Summary: Tool for converting texinfo documents to HTML Summary: Tool for converting texinfo documents to HTML
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Productivity/Publishing/Texinfo 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 Source0: http://download.savannah.nongnu.org/releases/texi2html/texi2html-%{version}.tar.bz2
Patch1: texi2html-1.78.dif Patch1: texi2html-1.78.dif
Patch2: texi2html-5584.patch Patch2: texi2html-5584.patch
@ -31,9 +31,11 @@ BuildRequires: perl
BuildRequires: perl-Text-Unidecode BuildRequires: perl-Text-Unidecode
BuildRequires: perl-gettext BuildRequires: perl-gettext
BuildRequires: perl-libintl-perl BuildRequires: perl-libintl-perl
BuildRequires: perl(Unicode::EastAsianWidth)
Requires: perl-Text-Unidecode Requires: perl-Text-Unidecode
Requires: perl-gettext Requires: perl-gettext
Requires: perl-libintl-perl Requires: perl-libintl-perl
Requires: perl(Unicode::EastAsianWidth)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Conflicts: texinfo < 5.0 Conflicts: texinfo < 5.0
@ -63,7 +65,13 @@ touch translations.pl
LANG=POSIX LANG=POSIX
LC_ALL=POSIX LC_ALL=POSIX
export LANG LC_ALL 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} make %{?_smp_mflags}
@ -71,7 +79,7 @@ make %{?_smp_mflags}
%make_install %make_install
rm -rf %{buildroot}%{_datadir}/texinfo/ rm -rf %{buildroot}%{_datadir}/texinfo/
rm -rf %{buildroot}%{_datadir}/locale/*.us-ascii 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
%find_lang %{name}_document %find_lang %{name}_document