[dib-utils/f21] Revert "Rebase on upstream dib-utils."

[slagle]

commit 3492d12bc66f2c6a72685b656f3884d89572318d
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 3 08:17:49 2014 -0400

    Revert "Rebase on upstream dib-utils."
    
    This reverts commit 11a7fb175cd70fd7024a5561143db162426e29aa.

 .gitignore     |    1 -
 dib-utils.spec |   37 ++++++++++++++++++-------------------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d8c102..af2b2ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /diskimage-builder-0.1.15.tar.gz
-/dib-utils-0.0.6.tar.gz
diff --git a/dib-utils.spec b/dib-utils.spec
index 4989b33..a470adc 100644
--- a/dib-utils.spec
+++ b/dib-utils.spec
@@ -1,40 +1,39 @@
+%global dib_release 0.1.15
+
 Name:       dib-utils
 Summary:    Pieces of diskimage-builder that are useful standalone
-Version:    0.0.6
-Release:    1%{?dist}
+Version:    0.0.0
+Release:    2%{?dist}
 License:    ASL 2.0
 Group:      System Environment/Base
-URL:        https://git.openstack.org/cgit/openstack/dib-utils
-Source0:    http://tarballs.openstack.org/dib-utils/dib-utils-%{version}.tar.gz
+# The long-term direction upstream is to split these files into their own
+# source repository, but due to time constraints we are executing the split
+# now in the rpm build.
+URL:        https://launchpad.net/diskimage-builder
+Source0:    http://tarballs.openstack.org/diskimage-builder/diskimage-builder-%{dib_release}.tar.gz
 
 BuildArch: noarch
 
 Conflicts: diskimage-builder < 0.1.15
 
-%description
-Pieces of diskimage-builder that are useful standalone.
-This allows them to be used without pulling in all of
-diskimage-builder and its dependencies.
-
 %prep
-%setup -q -n %{name}-%{version}
-
-%build
-%{__python} setup.py build
+%setup -q -n diskimage-builder-%{dib_release}
 
+# When the upstream repo is available this will be changed to a standard Python install
 %install
-%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+cp bin/dib-run-parts %{buildroot}%{_bindir}
 
+%description
+Pieces of diskimage-builder that are useful standalone.
+This allows them to be used without pulling in all of
+diskimage-builder and its dependencies.
 
 %files
-%doc README.md
+%doc LICENSE
 %{_bindir}/dib-run-parts
-%{python_sitelib}/dib_utils*
 
 %changelog
-* Wed Sep 17 2014 James Slagle <jslagle at redhat.com> - 0.0.6-1
-- Rebase on upstream dib-utils.
-
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index c77d1b3..c0cfde1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33f72d5d391c115cf5e7a98c8f6b0aae  dib-utils-0.0.6.tar.gz
+60b1cf4e377feb50abd2e07acdf37dc1  diskimage-builder-0.1.15.tar.gz