From a6539ef8579ea22c465856e0fdb80ca3a7d17df5fa2f4e17d2af42923d844a80 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 18 Feb 2022 12:15:24 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1196156 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=62 --- texinfo.changes | 14 -------------- texinfo.spec | 14 +++----------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/texinfo.changes b/texinfo.changes index a15c848..9eee825 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 16 09:33:41 UTC 2022 - Dr. Werner Fink - -- The new package texinfo-lang should not include the binaries - with its helper files, therefore recreate texinfo package -- Require glibc-locale at build time as otherwise perl falls - always back to C locale - -------------------------------------------------------------------- -Thu Feb 10 16:01:09 UTC 2022 - Stanislav Brabec - -- Split out texinfo-lang package, so info does not refer to - traslations from texinfo package. - ------------------------------------------------------------------- Thu Sep 30 11:25:48 UTC 2021 - Dr. Werner Fink diff --git a/texinfo.spec b/texinfo.spec index 14947a7..dafffbd 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,7 +1,7 @@ # # spec file for package texinfo # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,6 @@ Source42: %{name}-rpmlintrc Patch1: texinfo-zlib.patch Patch2: install-info_exitcode.patch BuildRequires: automake -BuildRequires: glibc-locale BuildRequires: help2man BuildRequires: libbz2-devel BuildRequires: libzio-devel @@ -51,7 +50,6 @@ Requires: texlive-makeindex Requires: texlive-pdftex Requires: texlive-tex Requires: texlive-texinfo -Recommends: %{name}-lang = %{version} Recommends: texi2html Recommends: texi2roff @@ -68,7 +66,6 @@ makeinfo tool. Summary: A Stand-Alone Terminal-Based Info Browser Requires: /usr/bin/gunzip Requires: /usr/bin/gzip -Recommends: %{name}-lang = %{version} %description -n info Info is a terminal-based program for reading documentation of computer @@ -94,15 +91,12 @@ Requires: perl(Text::Unidecode) %requires_eq perl Suggests: texinfo Provides: texinfo:%{_bindir}/makeinfo -Recommends: %{name}-lang = %{version} %description -n makeinfo Makeinfo translates Texinfo source documentation to various other formats, by default Info files suitable for reading online with Emacs or standalone GNU Info. -%lang_package - %prep %setup -q %patch1 -p1 -b .zio @@ -194,9 +188,7 @@ while file do file = rpm.next_file() end -%files lang -f %{name}.lang -f %{name}_document.lang - -%files +%files -f %{name}_document.lang %defattr(-,root,root,0755) %license COPYING %doc ABOUT-NLS AUTHORS NEWS README TODO @@ -215,7 +207,7 @@ end %{_mandir}/man5/texinfo.5%{?ext_man} %attr(644,root,root) %{_datadir}/texinfo/texindex.awk -%files -n makeinfo +%files -n makeinfo -f %{name}.lang %defattr(-,root,root,0755) %{_bindir}/makeinfo %{_bindir}/texi2any