From 745375fc12c97c3560fed10a066a5cdc6f8cd457 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 27 Jul 2012 17:38:49 +0000
Subject: use upstream brp-strip* as we provided older versions of upstream

(what's worse is that we didn't actually used them...)
---
 Makefile.am              |  3 ---
 NEWS                     |  1 +
 brp-strip                | 13 -------------
 brp-strip-comment-note   | 18 ------------------
 brp-strip-static-archive | 13 -------------
 5 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100755 brp-strip
 delete mode 100755 brp-strip-comment-note
 delete mode 100755 brp-strip-static-archive

diff --git a/Makefile.am b/Makefile.am
index a18a681..c83f107 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,6 @@ pkg_gconfig = \
 
 pkg_scripts = \
 		   brp-compress \
-		   brp-strip \
-		   brp-strip-comment-note \
-		   brp-strip-static-archive \
 		   brp-java-repack-jars \
 		   drop-ld-no-undefined-for-shared-lib-modules-in-libtool \
 		   filter.sh \
diff --git a/NEWS b/NEWS
index 1930dc2..cb04589 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@
 - kill unused find-provides.perl.in
 - prevent RPM_BUILD_ROOT to break brp-* scripts if it contains spaces
   (rpm.org#843)
+- use upstream brp-strip* as we provided older versions of upstream
 
 Version 1.151 - 26 Jul 2012, by Thierry Vignaud
 - fix %_libexecdir that changed to %_libdir when mga forked mdv
diff --git a/brp-strip b/brp-strip
deleted file mode 100755
index 7f52ed1..0000000
--- a/brp-strip
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
-	exit 0
-fi
-
-# Strip ELF binaries
-for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
-        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
-	grep -v ' shared object,' | \
-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do
-	strip -g $f || :
-done
diff --git a/brp-strip-comment-note b/brp-strip-comment-note
deleted file mode 100755
index 3d7ad4e..0000000
--- a/brp-strip-comment-note
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
-	exit 0
-fi
-
-# Strip .comment and .note sections (the latter only if it is not allocated)
-# for already stripped elf files in the build root
-for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
-        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, stripped/\1/p'`; do
-	note="-R .note"
-	if objdump -h $f 2>/dev/null | grep '^[ 	]*[0-9]*[ 	]*.note[ 	]' -A 1 | \
-		grep ALLOC >/dev/null; then
-		note=
-	fi
-	strip -R .comment $note $f || :
-done
diff --git a/brp-strip-static-archive b/brp-strip-static-archive
deleted file mode 100755
index 366d597..0000000
--- a/brp-strip-static-archive
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
-	exit 0
-fi
-
-# Strip static libraries.
-for f in `find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \
-        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
-	grep 'current ar archive' | \
-	sed -n -e 's/^\(.*\):[ 	]*current ar archive/\1/p'`; do
-	strip -g $f
-done
-- 
cgit v1.2.1