Fixes rpm spec file build issues (its not currently building).

Currently the rpm building process that cloud-init provides is
not working correctly. This adjusts the spec file, the setup.py
file and the distro files to ensure that it continues to work
as expected.

2 files changed, 15 insertions, 9 deletions

diff --git a/packages/brpm b/packages/brpm
index b8bbff9d..9657b1dd 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -244,6 +244,7 @@ def main():
     spec_fn = util.abs_join(root_dir, 'cloud-init.spec')
     util.write_file(spec_fn, contents)
     print("Created spec file at %r" % (spec_fn))
+    print(contents)
     for p in args.patches:
         util.copy(p, util.abs_join(arc_dir, os.path.basename(p)))
 
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 75dd4d22..81cccce5 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -81,7 +81,7 @@ ssh keys and to let the user run various scripts.
 %{__python} setup.py build
 
 %install
-rm -rf \$RPM_BUILD_ROOT
+
 %{__python} setup.py install -O1 \
             --skip-build --root \$RPM_BUILD_ROOT \
             --init-system=${init_sys}
@@ -92,6 +92,13 @@ mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
+# Remove the tests
+rm -rf \$RPM_BUILD_ROOT%{python_sitelib}/tests
+
+# Required dirs...
+mkdir -p \$RPM_BUILD_ROOT/%{_sharedstatedir}/cloud
+mkdir -p \$RPM_BUILD_ROOT/%{_libexecdir}/%{name}
+
 #if $systemd
 mkdir -p         \$RPM_BUILD_ROOT/%{_unitdir}
 cp -p systemd/*  \$RPM_BUILD_ROOT/%{_unitdir}
@@ -166,15 +173,11 @@ fi
 
 # Program binaries
 %{_bindir}/cloud-init*
-
-# There doesn't seem to be an agreed upon place for these
-# although it appears the standard says /usr/lib but rpmbuild
-# will try /usr/lib64 ??
-/usr/lib/%{name}/uncloud-init
-/usr/lib/%{name}/write-ssh-key-fingerprints
+%{_libexecdir}/%{name}/uncloud-init
+%{_libexecdir}/%{name}/write-ssh-key-fingerprints
 
 # Docs
-%doc TODO LICENSE ChangeLog requirements.txt
+%doc LICENSE ChangeLog TODO.rst requirements.txt
 %doc %{_defaultdocdir}/cloud-init/*
 
 # Configs
@@ -185,7 +188,9 @@ fi
 %dir                    %{_sysconfdir}/cloud/templates
 %config(noreplace)      %{_sysconfdir}/cloud/templates/*
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init
+
+%{_libexecdir}/%{name}
+%dir %{_sharedstatedir}/cloud
 
 # Python code is here...
 %{python_sitelib}/*