[rpms/gdb] gdb-17.2-rebase-f44: Revert 'Fix PDF build on Rawhide/F-29', rm -rf texinfo/ (from RH BZ 1562580).

[rpms/gdb] gdb-17.2-rebase-f44: Revert 'Fix PDF build on Rawhide/F-29', rm -rf texinfo/ (from RH BZ 1562580).

[Jan Kratochvil]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : fd48d313b88a8ad2cfd6f812c22279cb25467c11
Author : Jan Kratochvil <jan.kratochvil@redhat.com>
Date   : 2018-04-02T18:55:20+02:00
Stats  : +5/-63 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/fd48d313b88a8ad2cfd6f812c22279cb25467c11?branch=gdb-17.2-rebase-f44

Log:
Revert 'Fix PDF build on Rawhide/F-29', rm -rf texinfo/ (from RH BZ 1562580).

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index b9d3e6d..353356e 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -527,7 +527,3 @@ Patch126: gdb-ppc64-stwux-tautological-compare.patch
 # =fedoratest
 Patch127: gdb-rhbz1553104-s390x-arch12-test.patch
 
-# Fix PDF build on Rawhide/F-29.
-# =push
-Patch128: gdb-texinfo-path.patch
-

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index aa4fb19..28c6d1f 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -125,4 +125,3 @@
 %patch125 -p1
 %patch126 -p1
 %patch127 -p1
-%patch128 -p1

diff --git a/_patch_order b/_patch_order
index ed188d2..91c68da 100644
--- a/_patch_order
+++ b/_patch_order
@@ -125,4 +125,3 @@ gdb-vla-intel-fix-print-char-array.patch
 gdb-rhbz1540559-gdbaddindex-glibcdebug-regression.patch
 gdb-ppc64-stwux-tautological-compare.patch
 gdb-rhbz1553104-s390x-arch12-test.patch
-gdb-texinfo-path.patch

diff --git a/gdb-texinfo-path.patch b/gdb-texinfo-path.patch
deleted file mode 100644
index 72c0800..0000000
--- a/gdb-texinfo-path.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://sourceware.org/ml/gdb-patches/2018-03/msg00635.html
-Subject: [patch] Fix gdb/doc/ PDF build on Fedora Rawhide==F-29
-
-
---2fHTh5uZTiUOsy+g
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-Hi,
-
-on Fedora Rawhide==F-29 PDF build fails with:
-	https://kojipkgs.fedoraproject.org//work/tasks/2102/26052102/build.log
-	texi2dvi --pdf  -I ../../../gdb/doc/../mi -I ../../../gdb/doc \
-		../../../gdb/doc/gdb.texinfo
-	! I can't find file `texinfo.tex'.
-
-TBH I do not see how the file could be found in earlier versions.  Also both
-F-29 and F-28 have texinfo-tex-6.5-3.fc28.x86_64 while in F-28 it still builds
-fine but in F-29 it does not - so apparently it depends on some other package.
-
-But I did not investigate why as IMO the patch below is a logical one.
-
-OK for check-in?
-
-
-Jan
-
---2fHTh5uZTiUOsy+g
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename="gdb-texinfo-path.patch"
-
-gdb/ChangeLog
-2018-03-31  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* doc/Makefile.in (TEXI2DVI): Add $(SET_TEXINPUTS).
-
-diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
-index 0323bc4ecb..fa745b3542 100644
---- a/gdb/doc/Makefile.in
-+++ b/gdb/doc/Makefile.in
-@@ -63,7 +63,7 @@ MAKEHTMLFLAGS =
- TEXI2ROFF=texi2roff
- 
- # where to find texi2dvi, ditto
--TEXI2DVI=texi2dvi
-+TEXI2DVI=$(SET_TEXINPUTS) texi2dvi
- 
- # Package to install the docs under
- PACKAGE = @PACKAGE@
--- 
-2.17.0.rc1
-
-
---2fHTh5uZTiUOsy+g--
-

diff --git a/gdb.spec b/gdb.spec
index 2cbfd1a..e258001 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -26,7 +26,7 @@ Version: 8.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -471,7 +471,7 @@ rm -rf readline/*
 mv -f readline-doc readline/doc
 %endif # 0%{!?rhel:1} || 0%{?rhel} > 6
 
-rm -rf zlib
+rm -rf zlib texinfo
 
 %build
 rm -rf %{buildroot}
@@ -1026,6 +1026,9 @@ then
 fi
 
 %changelog
+* Mon Apr  2 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.1-14.fc28
+- Revert 'Fix PDF build on Rawhide/F-29', rm -rf texinfo/ (from RH BZ 1562580).
+
 * Sat Mar 31 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.1-13.fc28
 - Fix PDF build on Rawhide/F-29.