Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/beakerlib.git#58882f40a39ec093b6d10e14c84c0313f263a755

.gitignore

@@ -1,4 +1,5 @@
 *.tar.gz
+*.rpm
 .project
 *.orig
 *.rej

beakerlib.spec

@@ -1,6 +1,6 @@
 Name:       beakerlib
 Summary:    A shell-level integration testing library
-Version:    1.21
+Version:    1.22
 Release:    1%{?dist}
 License:    GPLv2
 BuildArch:  noarch
@@ -9,8 +9,28 @@ Autoreq:    0
 Requires:   nfs-utils
 Requires:   /bin/bash
 Requires:   /bin/sh
+%if 0%{?fedora}
 Recommends: /usr/bin/python3
+%endif
+%if 0%{?rhel} > 7
+Recommends: /usr/libexec/platform-python
+%else
+# rhel <= 7
+Requires:   /usr/bin/python
+%endif
+%if 0%{?rhel} < 8
+Requires:   /usr/bin/perl
+Requires:   wget
+Requires:   python-lxml
+Requires:   /usr/bin/xmllint
+%else
+# rhel > 7 and fedora
 Recommends: /usr/bin/perl
+Requires:   (wget or curl)
+Suggests:   wget
+Recommends: python3-lxml
+Recommends: /usr/bin/xmllint
+%endif
 Requires:   grep
 Requires:   sed
 Requires:   iproute
@@ -19,27 +39,48 @@ Requires:   tar
 Requires:   gzip
 Requires:   util-linux
 Requires:   which
+%if 0%{?fedora}
 Requires:   dnf-utils
+%else
+Requires:   yum-utils
+%endif
 Requires:   /usr/bin/bc
 Requires:   /usr/bin/time
-Requires:   (wget or curl)
-Suggests:   wget
-Recommends: python3-lxml
-Recommends: /usr/bin/xmllint
 Conflicts:  beakerlib-redhat < 1-30
 
 BuildRequires: /usr/bin/pod2man
 BuildRequires: perl-generators
 BuildRequires: util-linux
+BuildRequires: make
 
 Source0:    https://github.com/beakerlib/beakerlib/archive/%{name}-%{version}.tar.gz
 Source1:    %{name}-tmpfiles.conf
 
 Patch0: bugzilla-links.patch
-Patch1: python3.patch
+Patch1: bugzilla-links-epel.patch
+Patch2: python3.patch
+Patch3: python-platform.patch
 
 %prep
-%autosetup -p1
+%autosetup -N
+%if 0%{?fedora}
+# Patch0: bugzilla-links.patch
+%patch0 -p1
+%else
+# rhel
+# Patch1: bugzilla-links-epel.patch
+%patch1 -p1
+%endif
+
+%if 0%{?fedora}
+# Patch2: python3.patch
+%patch2 -p1
+%endif
+%if 0%{?rhel} > 7
+# Patch3: python-platform.patch
+%patch3 -p1
+%endif
+
 
 %build
 make build
@@ -74,6 +115,7 @@ could be used when writing operating system level integration tests.
 Summary: Files for syntax highlighting BeakerLib tests in VIM editor
 Requires: vim-common
 BuildRequires: vim-common
+BuildRequires: make
 
 %description vim-syntax
 Files for syntax highlighting BeakerLib tests in VIM editor
@@ -83,6 +125,13 @@ Files for syntax highlighting BeakerLib tests in VIM editor
 %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim
 
 %changelog
+* Fri Jan 15 2021 Dalibor Pospisil <dapospis@redhat.com> - 1.22-1
+- ability to parse fmf id references
+- ability the use simpler library name - library(foo), {url: '../foo.git', name: '/'}, meaming the library is n the root folder
+- ability put library even deeper in the tree - library(foo/path/to/the/library), {url: '../foo.git', name: '/path/to/the/library'}
+- rebased yash to 1.0
+- and few more minor fixes
+
 * Tue Dec 8 2020 Dalibor Pospisil <dapospis@redhat.com> - 1.21-1
 - Rebase to the laster upstream
 - better and more consistent search for libraries

bugzilla-links-epel.patch

@@ -0,0 +1,19 @@
+diff --git a/src/beakerlib.sh b/src/beakerlib.sh
+index 3355fa4..ceafc44 100644
+--- a/src/beakerlib.sh
++++ b/src/beakerlib.sh
+@@ -274,10 +274,14 @@ https://github.com/beakerlib/beakerlib/wiki/man
+ 
+ =item Issues list
+ 
++https://bugzilla.redhat.com/buglist.cgi?component=beakerlib&&order=bug_status%2Cassigned_to%2Cpriority
++
+ https://github.com/beakerlib/beakerlib/issues
+ 
+ =item Reporting issues
+ 
++https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=beakerlib
++
+ https://github.com/beakerlib/beakerlib/issues/new
+ 
+ =back

build-chain

@@ -1,11 +0,0 @@
-#!/bin/bash
-first_branch=$(head -n 1 supported-releases)
-current_branch=$(git rev-parse --abbrev-ref HEAD)
-next_branch=$(grep -A 1 $current_branch supported-releases | tail -n 1)
-[[ "$next_branch" == "$current_branch" ]] && next_branch=$first_branch
-
-git merger master && \
-git push && \
-fedpkg build --nowait && \
-git checkout $next_branch && \
-[[ "$next_branch" != "$first_branch" ]] && exec ./build-chain

python-platform.patch

@@ -0,0 +1,57 @@
+diff -ur beakerlib-1.18.old/src/python/journal-compare.py beakerlib-1.18.new/src/python/journal-compare.py
+--- beakerlib-1.18.old/src/python/journal-compare.py	2019-04-04 11:20:55.000000000 +0200
++++ beakerlib-1.18.new/src/python/journal-compare.py	2019-04-04 11:20:23.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/libexec/platform-python
+ 
+ # Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material
+ # is made available to anyone wishing to use, modify, copy, or
+diff -ur beakerlib-1.18.old/src/python/journalling.py beakerlib-1.18.new/src/python/journalling.py
+--- beakerlib-1.18.old/src/python/journalling.py	2019-04-04 11:20:55.000000000 +0200
++++ beakerlib-1.18.new/src/python/journalling.py	2019-04-04 11:20:27.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/libexec/platform-python
+ 
+ # Authors:  Jakub Heger        <jheger@redhat.com>
+ #           Dalibor Pospisil   <dapospis@redhat.com>
+diff -ur beakerlib-1.18.old/src/python/rlMemAvg.py beakerlib-1.18.new/src/python/rlMemAvg.py
+--- beakerlib-1.18.old/src/python/rlMemAvg.py	2019-04-04 11:20:55.000000000 +0200
++++ beakerlib-1.18.new/src/python/rlMemAvg.py	2019-04-04 11:20:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/libexec/platform-python
+ 
+ # Authors:  Petr Muller     <pmuller@redhat.com>
+ #
+diff -ur beakerlib-1.18.old/src/python/rlMemPeak.py beakerlib-1.18.new/src/python/rlMemPeak.py
+--- beakerlib-1.18.old/src/python/rlMemPeak.py	2019-04-04 11:20:55.000000000 +0200
++++ beakerlib-1.18.new/src/python/rlMemPeak.py	2019-04-04 11:20:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/libexec/platform-python
+ 
+ # Authors:  Petr Muller     <pmuller@redhat.com>
+ #
+diff -ur beakerlib-1.18.old/src/python/testwatcher.py beakerlib-1.18.new/src/python/testwatcher.py
+--- beakerlib-1.18.old/src/python/testwatcher.py	2019-04-04 11:20:55.000000000 +0200
++++ beakerlib-1.18.new/src/python/testwatcher.py	2019-04-04 11:20:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/libexec/platform-python
+ #
+ # Authors:  Jiri Jaburek    <jjaburek@redhat.com>
+ #
+diff -ur beakerlib-1.18.old/src/journal.sh beakerlib-1.18.new/src/journal.sh
+--- beakerlib-1.18.old/src/journal.sh
++++ beakerlib-1.18.new/src/journal.sh
+@@ -299,7 +299,7 @@ rlJournalEnd(){
+ __INTERNAL_JournalXMLCreate() {
+     local res=0
+     [[ "$BEAKERLIB_JOURNAL" == "0" ]] || {
+-      if which python &> /dev/null; then
++      if which /usr/libexec/platform-python &> /dev/null; then
+         $__INTERNAL_JOURNALIST $__INTERNAL_XSLT --metafile \
+           "$__INTERNAL_BEAKERLIB_METAFILE" --journal "$__INTERNAL_BEAKERLIB_JOURNAL"
+         res=$?

sources

@@ -1 +1 @@
-SHA512 (beakerlib-1.21.tar.gz) = e8ba2e51a412ff26e4ab69a1793fd18f42f5d333fed075a88382fc8702d1738eb6323e5d9d4aa745f51236e42a8f335e56b0f0484e11a3996be5e5be33883787
+SHA512 (beakerlib-1.22.tar.gz) = bce43ecf19487c3bc2e5d0cadd64677c7cbf03c2a0d92890e192b1ecb061946bee104ecf9eabc5c43b1b69d5b0cfcf8585eef6b47f2b6f4ea2c997d217abb24a

supported-releases

@@ -1,6 +0,0 @@
-master
-f28
-f27
-f26
-epel7
-el6

update-chain

@@ -1,11 +0,0 @@
-#!/bin/bash
-first_branch=$(head -n 1 supported-releases)
-current_branch=$(git rev-parse --abbrev-ref HEAD)
-next_branch=$(grep -A 1 $current_branch supported-releases | tail -n 1)
-[[ "$next_branch" == "$current_branch" ]] && next_branch=$first_branch
-
-git merge master && \
-git push && \
-fedpkg update && \
-git checkout $next_branch && \
-[[ "$next_branch" != "first_branch" ]] && exec ./update-chain