diff --git a/bash-4.3-patches.tar.bz2 b/bash-4.3-patches.tar.bz2 index 09afc56..e4540b9 100644 --- a/bash-4.3-patches.tar.bz2 +++ b/bash-4.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49ddb97d874d4d969a4f7dcefb239d472a18d75f42f7f72104a0dab87a305fad -size 24452 +oid sha256:9045192d9be7002a87bafe45344ef2ecdb993e3e5a2463008c18826cf0e66097 +size 24394 diff --git a/bash.changes b/bash.changes index c935363..447e36f 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 3 15:05:14 CET 2014 - jdelvare@suse.de + +- Fix the sed command that fixes up the patch headers. It was + printing a duplicate header line, which suprisingly did not + confuse patch, but could in the future. +- Fix all patches that had the duplicate header line issue. + ------------------------------------------------------------------- Fri Oct 24 12:53:04 UTC 2014 - werner@suse.de diff --git a/bash.spec b/bash.spec index 933ba3f..bbc6a23 100644 --- a/bash.spec +++ b/bash.spec @@ -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 diff --git a/readline-6.3-patches.tar.bz2 b/readline-6.3-patches.tar.bz2 index 7c65ab5..9b518a1 100644 --- a/readline-6.3-patches.tar.bz2 +++ b/readline-6.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85d1dde68eee9436479947f9c9c75dda2eafe80682a642c1f64f1f18551539b5 +oid sha256:76c2851a4f7d78fa109d07b95131bdb42540a12d0008ee234989550a68017253 size 3812