Accepting request 113387 from home:a_jaeger:my-factory-packages

Cleanup of patches.

OBS-URL: https://build.opensuse.org/request/show/113387
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=164

glibc-compiled-binaries.diff

@@ -7,11 +7,11 @@
  timezone/Makefile |    2 +-
  6 files changed, 20 insertions(+), 4 deletions(-)
 
-Index: config.make.in
+Index: glibc-2.15/config.make.in
 ===================================================================
---- config.make.in.orig
-+++ config.make.in
-@@ -99,6 +99,7 @@ add-ons = @add_ons@
+--- glibc-2.15.orig/config.make.in
++++ glibc-2.15/config.make.in
+@@ -100,6 +100,7 @@ add-ons = @add_ons@
  add-on-subdirs = @add_on_subdirs@
  sysdeps-add-ons = @sysdeps_add_ons@
  cross-compiling = @cross_compiling@
@@ -19,11 +19,11 @@ Index: config.make.in
  force-install = @force_install@
  
  # Build tools.
-Index: configure.in
+Index: glibc-2.15/configure.in
 ===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -16,6 +16,7 @@ if test $host != $build; then
+--- glibc-2.15.orig/configure.in
++++ glibc-2.15/configure.in
+@@ -15,6 +15,7 @@ if test $host != $build; then
    AC_CHECK_PROGS(BUILD_CC, gcc cc)
  fi
  AC_SUBST(cross_compiling)
@@ -31,11 +31,11 @@ Index: configure.in
  AC_PROG_CPP
  # We need the C++ compiler only for testing.
  AC_PROG_CXX
-Index: configure
+Index: glibc-2.15/configure
 ===================================================================
---- configure.orig
-+++ configure
-@@ -554,6 +554,7 @@ ac_clean_files=
+--- glibc-2.15.orig/configure
++++ glibc-2.15/configure
+@@ -553,6 +553,7 @@ ac_clean_files=
  ac_config_libobj_dir=.
  LIBOBJS=
  cross_compiling=no
@@ -83,10 +83,10 @@ Index: configure
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-Index: posix/Makefile
+Index: glibc-2.15/posix/Makefile
 ===================================================================
---- posix/Makefile.orig
-+++ posix/Makefile
+--- glibc-2.15.orig/posix/Makefile
++++ glibc-2.15/posix/Makefile
 @@ -320,7 +320,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	done < $(objpfx)getconf.speclist
  
@@ -96,10 +96,10 @@ Index: posix/Makefile
  	LC_ALL=C GETCONF_DIR=/dev/null \
  	$(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new
  	LC_ALL=C GETCONF_DIR=/dev/null \
-Index: sunrpc/Makefile
+Index: glibc-2.15/sunrpc/Makefile
 ===================================================================
---- sunrpc/Makefile.orig
-+++ sunrpc/Makefile
+--- glibc-2.15.orig/sunrpc/Makefile
++++ glibc-2.15/sunrpc/Makefile
 @@ -108,7 +108,7 @@ otherlibs += $(nssobjdir)/libnss_files.a
  	     $(resolvobjdir)/libresolv.a
  endif
@@ -109,10 +109,10 @@ Index: sunrpc/Makefile
  # We can only build this library if we can run the rpcgen we build.
  headers += $(rpcsvc:%.x=rpcsvc/%.h)
  extra-libs := librpcsvc
-Index: timezone/Makefile
+Index: glibc-2.15/timezone/Makefile
 ===================================================================
---- timezone/Makefile.orig
-+++ timezone/Makefile
+--- glibc-2.15.orig/timezone/Makefile
++++ glibc-2.15/timezone/Makefile
 @@ -69,7 +69,7 @@ installed-posixrules-file := $(firstword
  					 $(addprefix $(inst_zonedir)/, \
  						     $(posixrules-file)))