[diskimage-builder/el6] Rebase to released tarball

[Jeff Peeler]

commit 9566764c7caf3bf2c617ccf92e0efdb2a2cf6e36
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Thu Sep 5 14:56:16 2013 -0400

    Rebase to released tarball

 .gitignore             |    1 +
 diskimage-builder.spec |   31 +++++++++++++++----------------
 sources                |    2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2794ce7..b237a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /diskimage-builder-0.0.1-5b37036.tar.gz
+/diskimage-builder-0.0.1.tar.gz
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 088336c..528d450 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,27 +1,27 @@
-%global commit 5b37036c88b93f452c2822262b7f4d953f1495da
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
 Version:	0.0.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
-Source0:	https://github.com/stackforge/diskimage-builder/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
 
 ExclusiveArch: x86_64 noarch
 
 BuildArch: noarch
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
+BuildRequires: python-d2to1
+BuildRequires: python-pbr
 
 Requires: kpartx
 Requires: qemu-img
 Requires: busybox
+Requires: curl
 
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-%{version}
 
 %build
 %{__python} setup.py build
@@ -29,13 +29,11 @@ Requires: busybox
 %install
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
-mkdir -p %{buildroot}%{_sysconfdir}/sudoers.d/
 mkdir -p %{buildroot}%{_datadir}/%{name}/lib
 mkdir -p %{buildroot}%{_datadir}/%{name}/elements
 
-install -p -D -m 440 %{_builddir}/%{name}-%{commit}/sudoers.d/* %{buildroot}%{_sysconfdir}/sudoers.d/
-install -p -D -m 644 %{_builddir}/%{name}-%{commit}/lib/* %{buildroot}%{_datadir}/%{name}/lib
-cp -vr %{_builddir}/%{name}-%{commit}/elements/ %{buildroot}%{_datadir}/%{name}
+install -p -D -m 644 lib/* %{buildroot}%{_datadir}/%{name}/lib
+cp -vr elements/ %{buildroot}%{_datadir}/%{name}
 
 # explicitly remove config-applier since it does a pip install
 rm -rf %{buildroot}%{_datadir}/%{name}/elements/config-applier
@@ -50,14 +48,15 @@ Components of TripleO that are responsible for building disk images.
 %{python_sitelib}/diskimage_builder*
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/elements
-%config(noreplace) %attr(-,root,root) %{_sysconfdir}/sudoers.d/img-build-sudoers
-
-%verifyscript
-if ! visudo -c -f /etc/sudoers.d/img-build-sudoers; then
-  echo "Problem with img-build-sudoers file!"
-fi
 
 %changelog
+* Thu Sep 5 2013 Jeff Peeler <jpeeler at redhat.com> 0.0.1-6
+- rebase to a495079695e914fa7ec93292497bfc2471f41510
+- Source moved from stackforge to openstack
+- added curl requires
+- switched to pbr
+- remove all sudo related files as they are no longer used
+
 * Mon Aug 26 2013 Jeff Peeler <jpeeler at redhat.com> 0.0.1-5
 - added ExclusiveArch x86_64 because of qemu-img dependency
 
diff --git a/sources b/sources
index 2709e9e..941cd62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c39fa4c35ae14cc3addf6914dac34b94  diskimage-builder-0.0.1-5b37036.tar.gz
+76da38fc5a6095a59e63a43d2e9dea57  diskimage-builder-0.0.1.tar.gz