[beakerlib/f19] rebase to upstream 1.9

[Dalibor Pospisil]

commit 8a44c619abb6ef73a40dc299a775467a0cfd9563
Author: Dalibor Pospisil <dapospis at redhat.com>
Date:   Tue Jun 17 15:22:00 2014 +0200

    rebase to upstream 1.9

 .gitignore              |    1 +
 beakerlib-tmpfiles.conf |    1 +
 beakerlib.spec          |   27 ++++++++++++++++++++++++++-
 sources                 |    2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8aeab93..91eec36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ beakerlib-1.3.tar.gz
 /beakerlib-1.6.tar.gz
 /beakerlib-1.7.tar.gz
 /beakerlib-1.8.tar.gz
+/beakerlib-1.9.tar.gz
diff --git a/beakerlib-tmpfiles.conf b/beakerlib-tmpfiles.conf
new file mode 100644
index 0000000..39ad78b
--- /dev/null
+++ b/beakerlib-tmpfiles.conf
@@ -0,0 +1 @@
+x /var/tmp/beakerlib-*
diff --git a/beakerlib.spec b/beakerlib.spec
index ccdc0e3..deb31b6 100644
--- a/beakerlib.spec
+++ b/beakerlib.spec
@@ -1,15 +1,18 @@
 Name:       beakerlib
 Summary:    A shell-level integration testing library
-Version:    1.8
+Version:    1.9
 Release:    1%{?dist}
 License:    GPLv2
 Group:      Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 Source0:    https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
+Source1:    %{name}-tmpfiles.conf
 BuildArch:  noarch
 URL:        https://fedorahosted.org/%{name}
 Requires:   nfs-utils
 Requires:   python2
+Requires:   grep
+Requires:   sed
 BuildRequires: /usr/bin/pod2man
 
 
@@ -18,6 +21,16 @@ The BeakerLib project means to provide a library of various helpers, which
 could be used when writing operating system level integration tests.
 
 
+%package vim-syntax
+Summary: Files for syntax highlighting BeakerLib tests in VIM editor
+Group: Development/Libraries
+Requires: vim-common
+BuildRequires: vim-common
+
+%description vim-syntax
+Files for syntax highlighting BeakerLib tests in VIM editor
+
+
 %prep
 %setup -q
 
@@ -26,8 +39,11 @@ make build
 
 
 %install
+%{!?_tmpfilesdir: %global _tmpfilesdir %{_prefix}/lib/tmpfiles.d/}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 
 
 %clean
@@ -49,8 +65,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/VERSION
 %doc %{_docdir}/%{name}-%{version}/MAINTENANCE
 %doc %{_docdir}/%{name}-%{version}/examples/*/*
+%config %{_tmpfilesdir}/%{name}.conf
+
+
+%files vim-syntax
+%{_datadir}/vim/vimfiles/after/ftdetect/beakerlib.vim
+%{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim
 
 %changelog
+* Tue Jun 17 2014 Dalibor Pospisil <dapospis at redhat.com> - 1.9-1
+- rebase to upstream 1.9
+
 * Mon Jun 10 2013 Petr Muller <muller at redhat.com> - 1.8-1
 - Update to new upstream version (1.8)
 
diff --git a/sources b/sources
index 8443190..da804b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a18c09798e2b9a068bd50ed306d42af  beakerlib-1.8.tar.gz
+7405571fe5e8195325dfa889cd72a5c0  beakerlib-1.9.tar.gz