[beakerlib/el5: 5/5] reverted conditional phases support

[Dalibor Pospisil]

commit 11700cd308a130abcf90b6527bb7d351452848a7
Merge: 6c95d61 c04b682
Author: Dalibor Pospisil <dapospis at redhat.com>
Date:   Thu Jul 17 17:12:32 2014 +0200

    reverted conditional phases support

 ...onditional-phases-support-except-for-comm.patch |  113 ++++++++++++++++++++
 beakerlib.spec                                     |   10 +-
 2 files changed, 119 insertions(+), 4 deletions(-)
---
diff --cc beakerlib.spec
index 99d4e5c,45ca0b9..a7ef0dc
--- a/beakerlib.spec
+++ b/beakerlib.spec
@@@ -1,7 -1,7 +1,7 @@@
  Name:       beakerlib
  Summary:    A shell-level integration testing library
  Version:    1.9
--Release:    3%{?dist}
++Release:    4%{?dist}
  License:    GPLv2
  Group:      Development/Libraries
  BuildRoot:  %{_tmppath}/%{name}-%{version}-root
@@@ -13,28 -13,22 +13,29 @@@ Requires:   nfs-util
  Requires:   python2
  Requires:   grep
  Requires:   sed
 +Obsoletes:  rhtslib beaker-lib
 +Provides:   rhtslib beaker-lib
 +
 +Patch0: 0001-Do-not-use-with-open-as-foo-construct.patch
 +Patch2: 0001-mi-object-does-not-have-size-in-old-pythons.patch
 +Patch3: 0001-Fix-mktemp-call-for-older-RHELs.patch
 +Patch4: 0001-fir-for-python-compat-on-RHEL5.patch
  BuildRequires: /usr/bin/pod2man
 -Patch0: 0001-fixed-problem-with-IFS-other-that-space.patch
 -Patch1: 0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch
 -Patch2: 0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch
 -Patch3: 0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch
 -Patch4: 0005-rlHash-added-option-a-as-alias-to-algorithm.patch
 -Patch5: 0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch
 -Patch6: 0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch
 -Patch7: 0008-use-local-variable-instead-of-parameter.patch
 -Patch8: 0009-stored-namespace-key-cannot-be-empty.patch
 -Patch9: 0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch
 -Patch10: 0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch
 -Patch11: 0012-rlCheckRequirements-completely-supress-output-of-rlC.patch
 -Patch12: 0013-add-srpm-info-to-journal-bz1071693.patch
 -Patch13: 0014-supress-storage-data-in-non-debug-mode.patch
 -Patch14: 0001-reverting-conditional-phases-support-except-for-comm.patch
 +Patch5: 0001-fixed-problem-with-IFS-other-that-space.patch
 +Patch6: 0002-fixed-issue-with-wrong-number-parameters-passed-to-b.patch
 +Patch7: 0003-added-rlHash-and-rlUnhash-to-unify-hashing-in-variou.patch
 +Patch8: 0004-rlHash-added-base64_-algorithm-defaul-algorithm-chan.patch
 +Patch9: 0005-rlHash-added-option-a-as-alias-to-algorithm.patch
 +Patch10: 0006-__INTERNAL_FILEBACKUP_SET_PATH_CLEAN-__INTERNAL_FILE.patch
 +Patch11: 0007-__INTERNAL_rlIsDistro-suppressed-output-of-expr-spee.patch
 +Patch12: 0008-use-local-variable-instead-of-parameter.patch
 +Patch13: 0009-stored-namespace-key-cannot-be-empty.patch
 +Patch14: 0010-rlGetMakefileRequires-fixed-space-at-the-end-and-pos.patch
 +Patch15: 0011-log-rpm-package-also-in-non-asserted-rpm-checks.patch
 +Patch16: 0012-rlCheckRequirements-completely-supress-output-of-rlC.patch
 +Patch17: 0013-add-srpm-info-to-journal-bz1071693.patch
 +Patch18: 0014-supress-storage-data-in-non-debug-mode.patch
++Patch19: 0001-reverting-conditional-phases-support-except-for-comm.patch
  
  
  %description
@@@ -68,10 -63,6 +69,11 @@@ Files for syntax highlighting BeakerLi
  %patch12 -p1
  %patch13 -p1
  %patch14 -p1
 +%patch15 -p1
 +%patch16 -p1
 +%patch17 -p1
 +%patch18 -p1
++%patch19 -p1
  
  %build
  make build
@@@ -112,12 -103,12 +114,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim
  
  %changelog
 -* Tue Jul 17 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-3
++* Tue Jul 17 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-4
+ - reverted conditional phases support
+ 
 -* Tue Jul 2 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-2
 +* Tue Jul 2 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-3
  - bunch of fixes
  
- * Tue Jun 18 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-2
- - added missing patch for python compatibility
- 
  * Tue Jun 17 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-1
  - rebase to upstream 1.9