From b507b48218ddfa859fa6c80de643e687320dda5e8678f3be26e63f28eb372d0b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 20 Jul 2012 17:37:36 +0000
Subject: [PATCH] Accepting request 128487 from
 home:jengelh:branches:Base:System

- Add commit 10f62770e115d9f (glibc-sparc-fxstatat64.diff) from
  upstream to resolve rpmlint-induced packaging abort due to
  (previously) "no-return-in-nonvoid"
- Add xz as explicit BuildRequires for openSUSE_12.1

OBS-URL: https://build.opensuse.org/request/show/128487
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=206
---
 glibc-sparc-fxstatat64.diff | 25 +++++++++++++++++++++++++
 glibc.changes               |  8 ++++++++
 glibc.spec                  |  4 ++++
 3 files changed, 37 insertions(+)
 create mode 100644 glibc-sparc-fxstatat64.diff

diff --git a/glibc-sparc-fxstatat64.diff b/glibc-sparc-fxstatat64.diff
new file mode 100644
index 0000000..0fa799c
--- /dev/null
+++ b/glibc-sparc-fxstatat64.diff
@@ -0,0 +1,25 @@
+From 10f62770e115d9f16a67a974f79fa9b100cf827b Mon Sep 17 00:00:00 2001
+From: "David S. Miller" <davem@davemloft.net>
+Date: Tue, 13 Mar 2012 00:45:34 -0700
+Subject: [PATCH] Use correct implementation for dl-fxstatat64 on sparc64.
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c: New file.
+
+
+[rediffed for glibc-2.15 for openSUSE]
+---
+ sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+ create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
+
+Index: glibc-2.15/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
+===================================================================
+--- /dev/null
++++ glibc-2.15/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c
+@@ -0,0 +1,6 @@
++/* In this implementation we do not really care whether the call fails
++   because of missing kernel support since we do not even call the
++   function in this case.  */
++#undef __ASSUME_ATFCTS
++#define __ASSUME_ATFCTS 1
++#include "fxstatat.c"
diff --git a/glibc.changes b/glibc.changes
index 60040bd..cddfd15 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 20 15:06:49 UTC 2012 - jengelh@inai.de
+
+- Add commit 10f62770e115d9f (glibc-sparc-fxstatat64.diff) from
+  upstream to resolve rpmlint-induced packaging abort due to
+  (previously) "no-return-in-nonvoid"
+- Add xz as explicit BuildRequires for openSUSE_12.1
+
 -------------------------------------------------------------------
 Thu Jul 19 23:42:46 UTC 2012 - jengelh@inai.de
 
diff --git a/glibc.spec b/glibc.spec
index 5397cd4..e231376 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -33,6 +33,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  libselinux-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  makeinfo
+BuildRequires:  xz
 
 %define _filter_GLIBC_PRIVATE 1
 %if %_target_cpu == "i686"
@@ -293,6 +294,8 @@ Patch1019:      tr_TR.patch
 Patch1020:      glibc-2.16-arm-context.patch
 # PATCH-FIX-UPSTREAM  Fix dns buffer - aj@suse.de
 Patch1021:      glibc-2.16-getaddrinfo-buffer.patch
+# PATCH-FIX_UPSTREAM Use correct implementation of fxstatat64 on sparc64
+Patch1022:      glibc-sparc-fxstatat64.diff
 
 ### 
 # Patches awaiting upstream approval
@@ -568,6 +571,7 @@ rm nscd/s-stamp
 %patch1019 -p1
 %patch1020 -p1
 %patch1021 -p1
+%patch -P 1022 -p1
 
 %patch2001 -p1
 %patch2004 -p1