Drop glibc-rh825061.patch
The Perl Info generator in Texinfo 5.0 uses the input basename in the output file, so the multi-arch conflict no longer happens, and the Makefile tweak is not needed anymore.
This commit is contained in:
parent
6a6f54375a
commit
238627a99e
|
@ -1,13 +0,0 @@
|
|||
diff -rup a/manual/Makefile b/manual/Makefile
|
||||
--- a/manual/Makefile 2012-05-20 19:47:38.000000000 -0600
|
||||
+++ b/manual/Makefile 2012-05-29 22:23:33.920428631 -0600
|
||||
@@ -129,7 +129,8 @@ $(objpfx)%.c.texi: examples/%.c
|
||||
mv -f $@.new $@
|
||||
|
||||
$(objpfx)%.info: %.texinfo
|
||||
- LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $<
|
||||
+ LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=`basename $@` $<
|
||||
+ mv `basename $@`* $(objpfx)
|
||||
|
||||
$(objpfx)%.dvi: %.texinfo
|
||||
cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(<D) && pwd) --output=$@ \
|
|
@ -178,10 +178,6 @@ Source11: SUPPORTED
|
|||
# change this.
|
||||
Patch0001: glibc-fedora-nscd.patch
|
||||
|
||||
# Build info files in the source tree, then move to the build
|
||||
# tree so that they're identical for multilib builds
|
||||
Patch0005: glibc-rh825061.patch
|
||||
|
||||
# All these were from the glibc-fedora.patch mega-patch and need another
|
||||
# round of reviewing. Ideally they'll either be submitted upstream or
|
||||
# dropped.
|
||||
|
@ -287,7 +283,7 @@ BuildRequires: gd-devel libpng-devel zlib-devel
|
|||
# trigger documentation generation based on dependencies. We need to fix this
|
||||
# upstream in some way that doesn't depend on generating docs to validate the
|
||||
# texinfo. I expect it's simply the wrong dependency for that target.
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: texinfo >= 5.0
|
||||
%endif
|
||||
%if %{without bootstrap}
|
||||
BuildRequires: libselinux-devel >= 1.33.4-3
|
||||
|
@ -718,7 +714,6 @@ microbenchmark tests on the system.
|
|||
|
||||
# Patch order matters.
|
||||
%patch0001 -p1
|
||||
%patch0005 -p1
|
||||
%patch2007 -p1
|
||||
%patch0012 -p1
|
||||
%patch2013 -p1
|
||||
|
|
Loading…
Reference in New Issue