- Fixed 'tags out of date' problem with 'info bash' (bug #150118).

This commit is contained in:
Tim Waugh 2006-07-12 13:09:55 +00:00
parent 89f498d35f
commit af68b6e2e8
2 changed files with 35 additions and 0 deletions

30
bash-infotags.patch Normal file
View File

@ -0,0 +1,30 @@
--- bash-3.1/doc/Makefile.in.infotags 2006-07-12 13:57:18.000000000 +0100
+++ bash-3.1/doc/Makefile.in 2006-07-12 13:58:25.000000000 +0100
@@ -69,7 +69,6 @@
TEXI2HTML = ${SUPPORT_SRCDIR}/texi2html
MAN2HTML = ${BUILD_DIR}/support/man2html
HTMLPOST = ${srcdir}/htmlpost.sh
-INFOPOST = ${srcdir}/infopost.sh
QUIETPS = #set this to -q to shut up dvips
PAPERSIZE = letter # change to a4 for A4-size paper
PSDPI = 600 # could be 300 if you like
@@ -146,7 +145,7 @@
PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps
DVIFILES = bashref.dvi bashref.ps
-INFOFILES = bashref.info
+INFOFILES = bashref.info bash.info
MAN0FILES = bash.0 bashbug.0 builtins.0 rbash.0
HTMLFILES = bashref.html bash.html
PDFFILES = bash.pdf bashref.pdf article.pdf rose94.pdf
@@ -167,8 +166,8 @@
bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
-bash.info: bashref.info
- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+ $(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi -o $@
bash.txt: bash.1
bash.ps: bash.1

View File

@ -46,6 +46,7 @@ Patch118: bash-tty-tests.patch
Patch126: bash-setlocale.patch Patch126: bash-setlocale.patch
Patch127: bash-sighandler.patch Patch127: bash-sighandler.patch
Patch129: bash-read-memleak.patch Patch129: bash-read-memleak.patch
Patch130: bash-infotags.patch
Prefix: %{_prefix} Prefix: %{_prefix}
Requires: mktemp Requires: mktemp
Obsoletes: bash2 etcskel Obsoletes: bash2 etcskel
@ -102,6 +103,7 @@ compliance over previous versions.
%patch126 -p1 -b .setlocale %patch126 -p1 -b .setlocale
%patch127 -p1 -b .sighandler %patch127 -p1 -b .sighandler
%patch129 -p1 -b .read-memleak %patch129 -p1 -b .read-memleak
%patch130 -p1 -b .infotags
echo %{version} > _distribution echo %{version} > _distribution
echo %{release} > _patchlevel echo %{release} > _patchlevel
@ -234,6 +236,9 @@ fi
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog %changelog
* Wed Jul 12 2006 Tim Waugh <twaugh@redhat.com> 3.1-17
- Fixed 'tags out of date' problem with 'info bash' (bug #150118).
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.1-16.1 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.1-16.1
- rebuild - rebuild