[beakerlib/f18] Rebase

[Petr Muller]

commit d32ac1ae83a8baec2499ba36a04d8c5ebe24b118
Author: Petr Muller <muller at redhat.com>
Date:   Tue Apr 30 17:13:23 2013 +0200

    Rebase

 .gitignore                   |    1 +
 0001-install-dir.patch       |   40 ----------------------------------------
 0002-install-more-docs.patch |   25 -------------------------
 beakerlib.spec               |   16 +++++++---------
 sources                      |    2 +-
 5 files changed, 9 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f2fe58..f6afa83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ beakerlib-1.3.tar.gz
 /beakerlib-1.4.tar.gz
 /beakerlib-1.5.tar.gz
 /beakerlib-1.6.tar.gz
+/beakerlib-1.7.tar.gz
diff --git a/beakerlib.spec b/beakerlib.spec
index 4954b89..75b01fd 100644
--- a/beakerlib.spec
+++ b/beakerlib.spec
@@ -1,6 +1,6 @@
 Name:       beakerlib
 Summary:    A shell-level integration testing library
-Version:    1.6
+Version:    1.7
 Release:    1%{?dist}
 License:    GPLv2
 Group:      Development/Libraries
@@ -12,10 +12,6 @@ Requires:   nfs-utils
 Requires:   python2
 
 
-Patch0: 0001-install-dir.patch
-Patch1: 0002-install-more-docs.patch
-
-
 %description
 The BeakerLib project means to provide a library of various helpers, which
 could be used when writing operating system level integration tests.
@@ -23,12 +19,10 @@ could be used when writing operating system level integration tests.
 
 %prep
 %setup -q
-%patch0 -p1 -b .install-dir
-%patch1 -p1 -b .install-more-docs
+
 
 %build
-# This section is empty because this package ccontains shell scripts
-# to be sourced: there's nothing to build
+make build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,9 +46,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
 %doc %{_docdir}/%{name}-%{version}/VERSION
+%doc %{_docdir}/%{name}-%{version}/MAINTENANCE
 %doc %{_docdir}/%{name}-%{version}/examples/*/*
 
 %changelog
+* Tue Apr 30 2013 Petr Muller <muller at redhat.com> - 1.7-1
+Rebase to current version.
+
 * Wed Jul 25 2012 Petr Muller <muller at redhat.com> - 1.6-1
 - Updated to new upstream version
 
diff --git a/sources b/sources
index 1d95858..20062f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d303a229648b422114fbb1938aff4ae9  beakerlib-1.6.tar.gz
+c98fc4e1fe6914643d526e310f6e3483  beakerlib-1.7.tar.gz