SHA256
3
0
forked from pool/texinfo

Accepting request 956313 from Publishing

- Split locale text-domain to take care of package info 
- The package makeinfo needs both the locale text-domain of info
  and makeinfo

- Do not recommend texinfo-lang in package info anymore (boo#1196156)
- Rename texinfo-lang to makeinfo-lang as package makeinfo
  uses those locale files

- 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

- Split out texinfo-lang package, so info does not refer to
  traslations from texinfo package.

OBS-URL: https://build.opensuse.org/request/show/956313
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2022-02-22 20:17:35 +00:00 committed by Git OBS Bridge
parent a6539ef857
commit 5190140a1a
2 changed files with 42 additions and 3 deletions

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Mon Feb 21 07:44:17 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Split locale text-domain to take care of package info
- The package makeinfo needs both the locale text-domain of info
and makeinfo
-------------------------------------------------------------------
Fri Feb 18 13:12:44 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Do not recommend texinfo-lang in package info anymore (boo#1196156)
- Rename texinfo-lang to makeinfo-lang as package makeinfo
uses those locale files
-------------------------------------------------------------------
Wed Feb 16 09:33:41 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- 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 <sbrabec@suse.com>
- 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 <werner@suse.de> Thu Sep 30 11:25:48 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package texinfo # spec file for package texinfo
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 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
@ -31,6 +31,7 @@ Source42: %{name}-rpmlintrc
Patch1: texinfo-zlib.patch Patch1: texinfo-zlib.patch
Patch2: install-info_exitcode.patch Patch2: install-info_exitcode.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: glibc-locale
BuildRequires: help2man BuildRequires: help2man
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libzio-devel BuildRequires: libzio-devel
@ -66,6 +67,7 @@ makeinfo tool.
Summary: A Stand-Alone Terminal-Based Info Browser Summary: A Stand-Alone Terminal-Based Info Browser
Requires: /usr/bin/gunzip Requires: /usr/bin/gunzip
Requires: /usr/bin/gzip Requires: /usr/bin/gzip
Recommends: info-lang = %{version}
%description -n info %description -n info
Info is a terminal-based program for reading documentation of computer Info is a terminal-based program for reading documentation of computer
@ -91,12 +93,17 @@ Requires: perl(Text::Unidecode)
%requires_eq perl %requires_eq perl
Suggests: texinfo Suggests: texinfo
Provides: texinfo:%{_bindir}/makeinfo Provides: texinfo:%{_bindir}/makeinfo
Recommends: info-lang = %{version}
Recommends: makeinfo-lang = %{version}
%description -n makeinfo %description -n makeinfo
Makeinfo translates Texinfo source documentation to various other Makeinfo translates Texinfo source documentation to various other
formats, by default Info files suitable for reading online with Emacs formats, by default Info files suitable for reading online with Emacs
or standalone GNU Info. or standalone GNU Info.
%lang_package -n info
%lang_package -n makeinfo
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .zio %patch1 -p1 -b .zio
@ -188,7 +195,7 @@ while file do
file = rpm.next_file() file = rpm.next_file()
end end
%files -f %{name}_document.lang %files
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%license COPYING %license COPYING
%doc ABOUT-NLS AUTHORS NEWS README TODO %doc ABOUT-NLS AUTHORS NEWS README TODO
@ -207,7 +214,9 @@ end
%{_mandir}/man5/texinfo.5%{?ext_man} %{_mandir}/man5/texinfo.5%{?ext_man}
%attr(644,root,root) %{_datadir}/texinfo/texindex.awk %attr(644,root,root) %{_datadir}/texinfo/texindex.awk
%files -n makeinfo -f %{name}.lang %files -n makeinfo-lang -f %{name}_document.lang
%files -n makeinfo
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%{_bindir}/makeinfo %{_bindir}/makeinfo
%{_bindir}/texi2any %{_bindir}/texi2any
@ -217,6 +226,8 @@ end
%exclude %{_datadir}/texinfo/texindex.awk %exclude %{_datadir}/texinfo/texindex.awk
%{_datadir}/texinfo/ %{_datadir}/texinfo/
%files -n info-lang -f %{name}.lang
%files -n info %files -n info
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%ghost %verify(not md5 size mtime) %{_infodir}/dir %ghost %verify(not md5 size mtime) %{_infodir}/dir