- dropped broken kernel_includes patch (memusage build requires valid system headers...

Changed files:
    glibc.spec -> 1.545

diff --git a/glibc.spec b/glibc.spec
index 6598ec87100137f9749318180b9fbbd5bfca2957..1b0eb28bbb94c980d221e2f686ec792caecfa128 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -97,27 +97,25 @@ Patch8:             %{name}-missing-nls.patch
 Patch9:                %{name}-java-libc-wait.patch
 Patch10:       %{name}-lthrds_noomit.patch
 Patch11:       %{name}-no_opt_override.patch
-# this is broken (hardcoded /usr/src/linux)
-Patch12:       %{name}-kernel_includes.patch
-Patch13:       %{name}-includes.patch
-Patch14:       %{name}-soinit-EH_FRAME.patch
-Patch15:       %{name}-sparc-errno_fix.patch
-Patch16:       %{name}-csu-quotes.patch
-Patch17:       %{name}-tests-noproc.patch
-Patch18:       %{name}-new-charsets.patch
-Patch19:       %{name}-sr_CS.patch
-Patch20:       %{name}-sparc64-dl-machine.patch
-Patch21:       %{name}-tzfile-noassert.patch
-Patch22:       %{name}-morelocales.patch
-Patch23:       %{name}-locale_ZA.patch
-Patch24:       %{name}-locale_fixes.patch
-Patch25:       %{name}-LD_DEBUG.patch
+Patch12:       %{name}-includes.patch
+Patch13:       %{name}-soinit-EH_FRAME.patch
+Patch14:       %{name}-sparc-errno_fix.patch
+Patch15:       %{name}-csu-quotes.patch
+Patch16:       %{name}-tests-noproc.patch
+Patch17:       %{name}-new-charsets.patch
+Patch18:       %{name}-sr_CS.patch
+Patch19:       %{name}-sparc64-dl-machine.patch
+Patch20:       %{name}-tzfile-noassert.patch
+Patch21:       %{name}-morelocales.patch
+Patch22:       %{name}-locale_ZA.patch
+Patch23:       %{name}-locale_fixes.patch
+Patch24:       %{name}-LD_DEBUG.patch
 # PaX
-Patch26:       %{name}-pax_iconvconfig.patch
-Patch27:       %{name}-pax_dl-execstack.patch
-Patch28:       %{name}-sparc_comdat.patch
-Patch29:       %{name}-ia64_unwind.patch
-Patch30:       %{name}-ZA_collate.patch
+Patch25:       %{name}-pax_iconvconfig.patch
+Patch26:       %{name}-pax_dl-execstack.patch
+Patch27:       %{name}-sparc_comdat.patch
+Patch28:       %{name}-ia64_unwind.patch
+Patch29:       %{name}-ZA_collate.patch
 URL:           http://www.gnu.org/software/libc/
 BuildRequires: automake
 BuildRequires: binutils >= 2:2.15.90.0.3
@@ -793,10 +791,10 @@ Statyczne 64-bitowe biblioteki GNU libc.
 %patch10 -p1
 # don't know, if it is good idea, for brave ones
 #%patch11 -p1
-%{?with_kernelheaders:%patch12}
-%{?!with_kernelheaders:%patch13 -p1}
-%patch14 -p1
-%patch15 -p0
+%{!?with_kernelheaders:%patch12 -p1}
+%patch13 -p1
+%patch14 -p0
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -805,16 +803,15 @@ Statyczne 64-bitowe biblioteki GNU libc.
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
 # UPDATEME/DROPME
-# %patch25 -p0
+# %patch24 -p0
 # DROP
-#%patch26 -p1
+#%patch25 -p1
 # DROP
-#%patch27 -p1
+#%patch26 -p1
+%patch27 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
 
 chmod +x scripts/cpp