From 304d21920552854aab6fd8390b6d12c2ebace390 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 14 Jun 2017 19:33:15 +0000
Subject: Release Candidate 1 All features have now been implemented.

---
 buildah.spec      | 13 +++----------
 storage.conf      | 17 -----------------
 storage.conf.5.md | 49 -------------------------------------------------
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 storage.conf
 delete mode 100644 storage.conf.5.md

diff --git a/buildah.spec b/buildah.spec
index b8baad1..19b0d7f 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -26,13 +26,11 @@
 
 Name:           buildah
 Version:        0.1.0
-Release:        1.git%{shortcommit}%{?dist}
+Release:        2.git%{shortcommit}%{?dist}
 Summary:        A command line tool used to creating OCI Images
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
 Source:         https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source1:        storage.conf
-Source2:        storage.conf.5.md
 
 ExclusiveArch:  x86_64 aarch64 ppc64le
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
@@ -46,7 +44,7 @@ BuildRequires:  device-mapper-devel
 BuildRequires:  btrfs-progs-devel
 BuildRequires:  libassuan-devel
 Requires:       runc >= 1.0.0-7
-Requires:       skopeo-containers
+Requires:       skopeo-containers >= 0.1.20-2
 Provides:       %{repo} = %{version}-%{release}
 
 %description
@@ -76,11 +74,6 @@ make all
 
 %install
 export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
-mkdir -p %{buildroot}%{_sysconfdir}
-install -m0644 %SOURCE1 %{buildroot}%{_sysconfdir}/storage.conf
-mkdir -p %{buildroot}%{_mandir}/man5
-go-md2man -in %SOURCE2 -out %{buildroot}%{_mandir}/man5/storage.conf.1
-
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 
 #define license tag if not already defined
@@ -98,7 +91,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/buildah
 
 %changelog
-* Fri Apr 14 2017 Dan Walsh <dwalsh@redhat.com> 0.1.0-1.git597d2ab9
+* Wed Jun 14 2017 Dan Walsh <dwalsh@redhat.com> 0.1.0-2.git597d2ab9
 - Release Candidate 1
 - All features have now been implemented.
 
diff --git a/storage.conf b/storage.conf
deleted file mode 100644
index 519a0ab..0000000
--- a/storage.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# The "container storage" table contains all of the server options.
-[storage]
-
-# Default Storage Driver
-driver = "overlay"
-
-# Temporary storage location
-runroot = "/var/run/containers/storage"
-
-# Primary Read/Write location of container storage
-graphroot = "/var/lib/containers/storage"
-
-[storage.options]
-# AdditionalImageStores is used to pass paths to additional Read/Only image stores
-# Must be comma separated list.
-additionalimagestores = [
-]
diff --git a/storage.conf.5.md b/storage.conf.5.md
deleted file mode 100644
index 39a8fb7..0000000
--- a/storage.conf.5.md
+++ /dev/null
@@ -1,49 +0,0 @@
-% storage.conf(5) Container Storage Configuration File
-% Dan Walsh
-% May 2017
-
-# NAME
-storage.conf - Syntax of Container Storage configuration file
-
-# DESCRIPTION
-The STORAGE configuration file specifies all of the available container storage options
-for tools using shared container storage, but in a TOML format that can be more easily modified
-and versioned.
-
-# FORMAT
-The [TOML format][toml] is used as the encoding of the configuration file.
-Every option and subtable listed here is nested under a global "storage" table.
-No bare options are used. The format of TOML can be simplified to:
-
-    [table]
-    option = value
-
-    [table.subtable1]
-    option = value
-
-    [table.subtable2]
-    option = value
-
-## STORAGE TABLE
-
-The `storage` table supports the following options:
-
-
-**graphroot**=""
-  container storage graph dir (default: "/var/lib/containers/storage")
-  Default directory to store all writable content created by container storage programs
-
-**runroot**=""
-  container storage run dir (default: "/var/run/containers/storage")
-  Default directory to store all temporary writable content created by container storage programs
-
-**driver**=""
-  container storage driver (default is "overlay")
-  Default Copy On Write (COW) container storage driver
-
-**additionalimagestores**=[]
-  Paths to additional congtainer image stores. Usually these are read/only and stored on remote network shares.
-
-# HISTORY
-May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
-Format copied from crio.conf man page created by Aleksa Sarai <asarai@suse.de>
-- 
cgit