[diskimage-builder] Update to upstream 0.1.34

slagle slagle at fedoraproject.org
Mon Oct 20 19:45:38 UTC 2014


commit 61daffb3df5907ffd3b4e495a955f8ada579d421
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Oct 20 15:45:17 2014 -0400

    Update to upstream 0.1.34

 .gitignore                                         |    1 +
 0001-Check-for-epel-before-installing-it.patch     |   29 --------------
 ...AML.patch => 0001-svc-map-requires-PyYAML.patch |    2 +-
 0002-Move-install-bin-from-rpm-distro-to-yum.patch |   41 --------------------
 diskimage-builder.spec                             |   13 +++---
 sources                                            |    2 +-
 6 files changed, 9 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53f7e26..c04c597 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /diskimage-builder-0.1.31.tar.gz
 /diskimage-builder-0.1.32.tar.gz
 /diskimage-builder-0.1.33.tar.gz
+/diskimage-builder-0.1.34.tar.gz
diff --git a/0003-svc-map-requires-PyYAML.patch b/0001-svc-map-requires-PyYAML.patch
similarity index 91%
rename from 0003-svc-map-requires-PyYAML.patch
rename to 0001-svc-map-requires-PyYAML.patch
index c2a2ba7..4a03b8d 100644
--- a/0003-svc-map-requires-PyYAML.patch
+++ b/0001-svc-map-requires-PyYAML.patch
@@ -1,4 +1,4 @@
-From e5af5c6f8206d7a245e98bd79d3bbe0f43cc8b77 Mon Sep 17 00:00:00 2001
+From 0d5d09eab8e26085af5cc290f62f8e65d0360965 Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Fri, 17 Oct 2014 11:46:18 -0400
 Subject: [PATCH] svc-map requires PyYAML
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index f3af927..a12a3d5 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,15 +1,13 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
-Version:	0.1.33
-Release:	4%{?dist}
+Version:	0.1.34
+Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
 Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
 
-Patch0001: 0001-Check-for-epel-before-installing-it.patch
-Patch0002: 0002-Move-install-bin-from-rpm-distro-to-yum.patch
-Patch0003: 0003-svc-map-requires-PyYAML.patch
+Patch0001: 0001-svc-map-requires-PyYAML.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -30,8 +28,6 @@ Requires: dib-utils
 %setup -q -n %{name}-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
 
 %build
 %{__python} setup.py build
@@ -68,6 +64,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Mon Oct 20 2014 James Slagle <jslagle at redhat.com> 0.1.34-1
+- Update to upstream 0.1.34
+
 * Fri Oct 17 2014 James Slagle <jslagle at redhat.com> 0.1.33-4
 - svc-map requires PyYAML
 
diff --git a/sources b/sources
index 5c2e4b5..637b888 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-433cdf570cf948bead970573d77e864b  diskimage-builder-0.1.33.tar.gz
+e1db60ab19bb3092b59ad47a999b0405  diskimage-builder-0.1.34.tar.gz


More information about the scm-commits mailing list