re-import sources as agreed with the maintainer

This commit is contained in:
Adam Samalik 2023-07-24 14:02:54 +02:00
parent bccf1ccc7c
commit 1a2601c1d4
6 changed files with 69 additions and 11 deletions

4
.gitignore vendored
View File

@ -1,2 +1,4 @@
/info-6.5-sync-fix-info-dir.patch
/texinfo-6.4.tar.xz
/texinfo-6.4.tar.xz.sig
/texinfo-6.5.tar.xz
/texinfo-6.5.tar.xz.sig

View File

@ -0,0 +1,40 @@
diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
--- texinfo-6.5.orig/contrib/fix-info-dir 2014-04-22 03:56:56.000000000 +0200
+++ texinfo-6.5/contrib/fix-info-dir 2018-02-04 13:48:35.979359350 +0100
@@ -163,29 +163,23 @@
{
### output the dir header
- echo "-*- Text -*-"
- echo "This file was generated automatically by $0."
- echo "This version was generated on `date`"
- echo "by `whoami`@`hostname` for `pwd`"
cat<<DIR_FILE_END_OF_FILE
-This is the file .../info/$DIR_FILE, which contains the topmost node of the
-Info hierarchy. The first time you invoke Info you start off
-looking at that node, which is ($DIR_FILE)Top.
-
+This is the file .../info/$DIR_FILE, which contains the
+topmost node of the Info hierarchy, called ($DIR_FILE)Top.
+The first time you invoke Info you start off looking at this node.

-File: $DIR_FILE Node: Top This is the top of the INFO tree
+File: $DIR_FILE, Node: Top This is the top of the INFO tree
This (the Directory node) gives a menu of major topics.
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
+ Typing "q" exits, "H" lists all Info commands, "d" returns here,
"h" gives a primer for first-timers,
- "mEmacs<Return>" visits the Emacs topic, etc.
+ "mEmacs<Return>" visits the Emacs manual, etc.
In Emacs, you can click mouse button 2 on a menu item or cross reference
to select it.
-* Menu: The list of major topics begins on the next line.
-
+* Menu:
DIR_FILE_END_OF_FILE
### go through the list of files in the skeleton. If an info file

View File

@ -1,2 +1,2 @@
SHA512 (info-6.5-sync-fix-info-dir.patch) = 50b333e0d82dafd3c1f237bc725437b75b8bfcd6a99c807113a4d63097818d6fdbbd5f6403e1aa9ac5279d8cd6122f77aa36e8704efae28da0ab2aa13c226e02
SHA512 (texinfo-6.5.tar.xz) = 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
SHA512 (texinfo-6.5.tar.xz.sig) = d1b3e0bdaf80316410bb10edd25edfbf83afd6ac9a34881487722a9aafeab381272c946acd649b745f1bd9a55f279d05ac638ef610c09f4347f5e3e893b47c4f

23
tests/tests.yml Normal file
View File

@ -0,0 +1,23 @@
---
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
repositories:
- repo: "git://pkgs.devel.redhat.com/tests/texinfo"
dest: "tree"
tests:
- tree/Sanity/Testsuite
- tree/Regression/bz1134160-start-numbers-bigger-10
- tree/security/CAN-2005-3011
required_packages:
- texinfo
- texinfo-tex
- zlib-devel
- ncurses-devel
- help2man
- rpm-build
- gcc
- perl-generators
- strace

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iF4EABEIAAYFAlm4QBsACgkQ3bxXnas3+6mlNwD/Tzn0IxHxWCII18A72dLZ0rDB
0GtvrWV4c/wtYHSGSNEA/3iIAv2qbGreDAXAzLHKsWm5vKzFvRPeDS7GBJQg018q
=EUkI
-----END PGP SIGNATURE-----

View File

@ -19,7 +19,7 @@ Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
Patch3: info-6.5-sync-fix-info-dir.patch
# Patch4: fixes issues detected by static analysis
Patch4: texinfo-6.5-covscan-fixes.patch
# Patch5: rhbz#2033676, fixes a loop when /dev/null doesn't exist
# Patch5: rhbz#2022201, fixes a loop when /dev/null doesn't exist
Patch5: texinfo-6.5-fix-info-dir.patch
BuildRequires: gcc
BuildRequires: perl-generators
@ -148,7 +148,7 @@ export ALL_TESTS=yes
%changelog
* Mon Jan 17 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-7
- Fix a loop in fix-info-dir when /dev/null doesn't exist
Resolves: #2033676
Resolves: #2022201
* Thu Jan 09 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-6
- Fix file mode for dir.old (fixes failing rpm -V info)