From d53002b1ace49d17256edb4f2aef9893dd22573095da01a7b2d18a6e3f65a360 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 29 Jun 2011 08:03:50 +0000 Subject: [PATCH] Accepting request 74808 from home:a_jaeger:branches:openSUSE:Factory Only apply glibc-2.10.99-ia64-include.diff on SLE OBS-URL: https://build.opensuse.org/request/show/74808 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=71 --- glibc.changes | 6 ++++++ glibc.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index 4d55a4e..eb0d1c0 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 28 12:30:34 UTC 2011 - aj@suse.de + +- Only apply glibc-2.10.99-ia64-include.diff on SLE but not on + openSUSE. + ------------------------------------------------------------------- Mon Jun 27 12:19:47 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index a3f5618..b48e68a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -165,7 +165,7 @@ Patch39: glibc-2.10.99-ia64-include.diff Patch40: libm-x86-64-exceptions.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch41: glibc-uio-cell.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828 Patch42: glibc-statfs64-ia64.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch43: missing-include-build-fix.diff @@ -428,7 +428,10 @@ rm nscd/s-stamp %patch39 %patch40 %patch41 -p1 +%if 0%{?sles_version} +# Only apply for x86 on SLES %patch42 +%endif %patch43 -p1 %patch44 -p1 %patch45