diff --git a/.gitignore b/.gitignore index fe1c9fe..78057b4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ beakerlib-1.3.tar.gz /beakerlib-1.8.tar.gz /beakerlib-1.9.tar.gz /beakerlib-1.10.tar.gz +/beakerlib-1.11.tar.gz diff --git a/beakerlib.spec b/beakerlib.spec index 1a4aa34..4a262d1 100644 --- a/beakerlib.spec +++ b/beakerlib.spec @@ -1,7 +1,7 @@ Name: beakerlib Summary: A shell-level integration testing library -Version: 1.10 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} License: GPLv2 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -13,10 +13,10 @@ Requires: nfs-utils Requires: python2 Requires: grep Requires: sed +Requires: net-tools +Requires: rpm-python BuildRequires: /usr/bin/pod2man -Patch0: do-remount-if-already-mounted.patch - %description The BeakerLib project means to provide a library of various helpers, which could be used when writing operating system level integration tests. @@ -32,7 +32,6 @@ Files for syntax highlighting BeakerLib tests in VIM editor %prep %setup -q -%patch0 -p1 -b .remount %build make build @@ -72,6 +71,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim %changelog +* Thu Oct 29 2015 Dalibor Pospisil - 1.11-1 +- fixed bugs 971347, 1076471, 1262888, 1216177, 1184414, 1192535, 1224345, + 1211269, 1224362, 1205330, 1175513, 1211617, 1221352 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Feb 4 2015 Dalibor Pospisil - 1.10-2 - remount if mounting already mounted mount point with options, fixes bug 1173623 diff --git a/do-remount-if-already-mounted.patch b/do-remount-if-already-mounted.patch deleted file mode 100644 index fba2238..0000000 --- a/do-remount-if-already-mounted.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0474dc962be56f7292e595423c092c3d4117eb99 Mon Sep 17 00:00:00 2001 -From: Dalibor Pospisil -Date: Fri, 12 Dec 2014 15:25:56 +0100 -Subject: [PATCH 1/5] __INTERNAL_Mount: do remount if already mounted and - options specified - -If option 'rw' is specified, automatically prepend 'remount' to options if it is not already present. ---- - src/infrastructure.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/infrastructure.sh b/src/infrastructure.sh -index e911fc9..29a5d43 100644 ---- a/src/infrastructure.sh -+++ b/src/infrastructure.sh -@@ -86,8 +86,12 @@ __INTERNAL_Mount(){ - - if __INTERNAL_CheckMount "$MNTPATH" - then -+ if [[ -z "$OPTIONS" ]]; then - rlLogInfo "$WHO already mounted: success" - return 0 -+ else -+ [[ "$OPTIONS" =~ remount ]] || OPTIONS="remount,$OPTIONS" -+ fi - elif [ ! -d "$MNTPATH" ] - then - rlLogInfo "$WHO creating directory $MNTPATH" --- -1.9.3 - diff --git a/sources b/sources index c692355..2d958dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94276ab219a82ae98275cfb2ee928a97 beakerlib-1.10.tar.gz +550f7cb1dc391b9bb4f320dabadcddb5 beakerlib-1.11.tar.gz