diff --git a/0001-fix-issue-on-bash-v3-bz1150672.patch b/0001-fix-issue-on-bash-v3-bz1150672.patch new file mode 100644 index 0000000..6a7e6ca --- /dev/null +++ b/0001-fix-issue-on-bash-v3-bz1150672.patch @@ -0,0 +1,25 @@ +From 3cbfb525b6de1a147a2fc98c5f12c965e3bd1946 Mon Sep 17 00:00:00 2001 +From: Dalibor Pospisil +Date: Wed, 8 Oct 2014 18:02:13 +0200 +Subject: [PATCH] fix issue on bash v3 bz1150672 + +--- + src/testing.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/testing.sh b/src/testing.sh +index 480eaa0..b5f2751 100644 +--- a/src/testing.sh ++++ b/src/testing.sh +@@ -1092,7 +1092,7 @@ __INTERNAL_rlIsDistro(){ + fi + else + rlLogDebug "arg='$arg'" +- if [[ "$arg" =~ \. ]]; then ++ if [[ "$arg" =~ [.] ]]; then + rlLogDebug 'evaluation whole version (including minor)' + rlLogDebug "executing rlTestVersion \"$whole\" \"$sign\" \"$arg\"" + rlTestVersion "$whole" "$sign" "$arg" +-- +1.9.3 + diff --git a/beakerlib.spec b/beakerlib.spec index 01f6591..3377371 100644 --- a/beakerlib.spec +++ b/beakerlib.spec @@ -1,7 +1,7 @@ Name: beakerlib Summary: A shell-level integration testing library Version: 1.9 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -38,6 +38,7 @@ Patch18: 0014-supress-storage-data-in-non-debug-mode.patch Patch19: 0001-reverting-conditional-phases-support-except-for-comm.patch Patch20: 0001-check-.count-of-rpm.mi-objects-instead-of-relying-on.patch Patch21: 0002-remove-trailing-spaces-from-beakerlib_rpm-and-beaker.patch +Patch22: 0001-fix-issue-on-bash-v3-bz1150672.patch %description @@ -78,6 +79,7 @@ Files for syntax highlighting BeakerLib tests in VIM editor %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build make build @@ -118,14 +120,17 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim %changelog -* Tue Oct 6 2014 Dalibor Pospisil - 1.9-5 +* Wed Oct 8 2014 Dalibor Pospisil - 1.9-6 +- fix of regexp issue on bash v3, fixes bz1150672 + +* Mon Oct 6 2014 Dalibor Pospisil - 1.9-5 - bz1142535: check count of rpm.mi objects instead of relying on bool coercion - remove trailing spaces from beakerlib_rpm and beakerlib_redhat_rpm elements -* Tue Jul 17 2014 Dalibor Pospisil - 1.9-4 +* Thu Jul 17 2014 Dalibor Pospisil - 1.9-4 - reverted conditional phases support -* Tue Jul 2 2014 Dalibor Pospisil - 1.9-3 +* Wed Jul 2 2014 Dalibor Pospisil - 1.9-3 - bunch of fixes * Tue Jun 17 2014 Dalibor Pospisil - 1.9-1