Accepting request 263939 from home:jdelvare:branches:Base:System

- Fix the sed command that fixes up the patch headers. It was printing a duplicate header line, which surprisingly did not confuse patch, but could in the future.
- Fix all patches that had the duplicate header line issue.

OBS-URL: https://build.opensuse.org/request/show/263939
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=194
This commit is contained in:
2014-12-18 14:31:09 +00:00
committed by Git OBS Bridge
parent f72b592a19
commit f24b4d86ea
4 changed files with 13 additions and 5 deletions

View File

@@ -283,7 +283,7 @@ for patch in ../bash-%{bash_vers}-patches/*; do
let level++ || true
fi
test -e $file || exit 1
sed -ri '/^\*\*\* \.\./{ s@\.\./bash-%{bash_vers}[^/]*/@@p }' $patch
sed -ri '/^\*\*\* \.\./{ s@\.\./bash-%{bash_vers}[^/]*/@@ }' $patch
echo Patch $patch
patch -s -p$level < $patch
done
@@ -325,7 +325,7 @@ for patch in ../readline-%{rl_vers}-patches/*; do
file=${file#*/}
let level++ || true
fi
sed -ri '/^\*\*\* \.\./{ s@\.\./readline-%{rl_vers}[^/]*/@@p }' $patch
sed -ri '/^\*\*\* \.\./{ s@\.\./readline-%{rl_vers}[^/]*/@@ }' $patch
echo Patch $patch
patch -s -p$level < $patch
done