From 3f6f92f45d3b581157eb87944fef7476b1841e60949e5470314fbe86875adc86 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 22 May 2012 12:22:12 +0000
Subject: [PATCH] Accepting request 121763 from
 home:a_jaeger:my-factory-packages

Revert getconf change, it breaks build.

OBS-URL: https://build.opensuse.org/request/show/121763
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=184
---
 glibc-2.8-getconf.diff | 18 ++++++++++++++++++
 glibc.changes          |  1 -
 glibc.spec             |  3 +++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 glibc-2.8-getconf.diff

diff --git a/glibc-2.8-getconf.diff b/glibc-2.8-getconf.diff
new file mode 100644
index 0000000..20789c7
--- /dev/null
+++ b/glibc-2.8-getconf.diff
@@ -0,0 +1,18 @@
+This is required for too noisy rpmlint:
+glibc.i586: E: hardlink-across-partition (Badness: 10000) /usr/lib/getconf/POSIX_V7_ILP32_OFFBIG /usr/bin/getconf
+
+
+Index: glibc-2.15/posix/Makefile
+===================================================================
+--- glibc-2.15.orig/posix/Makefile
++++ glibc-2.15/posix/Makefile
+@@ -316,8 +316,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+ 	$(addprefix $(..)./scripts/mkinstalldirs ,\
+ 		    $(filter-out $(wildcard $@),$@))
+ 	while read spec; do \
+-	  ln -f $< $@/$$spec.new || $(INSTALL_PROGRAM) $< $@/$$spec.new; \
+-	  mv -f $@/$$spec.new $@/$$spec; \
++	  ln -s ../../bin/getconf $@/$$spec; \
+ 	done < $(objpfx)getconf.speclist
+ 
+ $(objpfx)getconf.speclist: $(objpfx)getconf
diff --git a/glibc.changes b/glibc.changes
index 923f86d..00a0afe 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,6 +1,5 @@
 Wed May 16 08:37:57 UTC 2012 - schwab@linux-m68k.org
 
-- Properly install getconf compilation environment spec links
 - Fix confstr use of local buffer outside its extent
 
 -------------------------------------------------------------------
diff --git a/glibc.spec b/glibc.spec
index 23739e3..795c3d8 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -195,6 +195,8 @@ Patch13:        glibc-2.3.2.no_archive.diff
 Patch14:        glibc-2.3.90-bindresvport.blacklist.diff
 # PATCH-FIX-OPENSUSE prefer -lang rpm packages
 Patch15:        glibc-2.3.90-langpackdir.diff
+# PATCH-FIX-OPENSUSE Do not generate hardlink for getconf
+Patch16:        glibc-2.8-getconf.diff
 # PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries
 Patch17:        glibc-compiled-binaries.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
@@ -508,6 +510,7 @@ rm nscd/s-stamp
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 # This should be fixed in valgrind now