From d79e9fd06b735f663635e20dcd2516b0956384b38ac0ac488e366c6de416ea4e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 24 Sep 2013 12:26:06 +0000
Subject: [PATCH] Accepting request 200349 from
 home:bernhard-voelker:branches:Base:System

- replace obsoleted "find -perm +NNN" syntax [bnc#842004]
  to "-perm /NNN" in debugsource-package.diff and
  finddebuginfo.diff.

OBS-URL: https://build.opensuse.org/request/show/200349
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=292
---
 debugsource-package.diff | 4 ++--
 finddebuginfo.diff       | 2 +-
 rpm.changes              | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debugsource-package.diff b/debugsource-package.diff
index 11eae89..5daf8e5 100644
--- a/debugsource-package.diff
+++ b/debugsource-package.diff
@@ -31,9 +31,9 @@ build the binary. The patches moves them into a separate package -debugsource.
  $strict || strict_error=WARNING
  
 -# Strip ELF binaries
--find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
+-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
 +# Strip ELF binaries (and no static libraries)
-+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
  xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
  while read nlinks inum f; do
    case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
diff --git a/finddebuginfo.diff b/finddebuginfo.diff
index 11be196..1a6aca0 100644
--- a/finddebuginfo.diff
+++ b/finddebuginfo.diff
@@ -39,7 +39,7 @@
 -		     -print |
 -file -N -f - | sed -n -e 's/^\(.*\):[ 	]*.*ELF.*, not stripped/\1/p' |
 -xargs --no-run-if-empty stat -c '%h %D_%i %n' |
-+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
++find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
 +xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
  while read nlinks inum f; do
 +  case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
diff --git a/rpm.changes b/rpm.changes
index 509b0a1..7e5c869 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 24 10:36:15 UTC 2013 - mail@bernhard-voelker.de
+
+- replace obsoleted "find -perm +NNN" syntax [bnc#842004]
+  to "-perm /NNN" in debugsource-package.diff and
+  finddebuginfo.diff.
+
 -------------------------------------------------------------------
 Wed Sep 11 18:28:39 CEST 2013 - mls@suse.de