cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/rpm-spec-fixups into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/rpm-spec-fixups/+merge/238219

Fixes rpm spec file build issues (its not currently building).
-- 
https://code.launchpad.net/~harlowja/cloud-init/rpm-spec-fixups/+merge/238219
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/rpm-spec-fixups into lp:cloud-init.

=== modified file 'packages/brpm'
--- packages/brpm	2014-07-21 18:47:08 +0000
+++ packages/brpm	2014-10-13 22:40:01 +0000
@@ -244,6 +244,7 @@
     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)))
 

=== modified file 'packages/redhat/cloud-init.spec.in'
--- packages/redhat/cloud-init.spec.in	2014-02-10 20:48:41 +0000
+++ packages/redhat/cloud-init.spec.in	2014-10-13 22:40:01 +0000
@@ -81,7 +81,7 @@
 %{__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,9 @@
 cp -p tools/21-cloudinit.conf \
       \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
+rm -rf \$RPM_BUILD_ROOT%{python_sitelib}/tests
+mkdir -p \$RPM_BUILD_ROOT/var/lib/cloud
+
 %clean
 rm -rf \$RPM_BUILD_ROOT
 
@@ -169,7 +172,7 @@
 /usr/lib/%{name}/write-ssh-key-fingerprints
 
 # Docs
-%doc TODO LICENSE ChangeLog requirements.txt
+%doc LICENSE ChangeLog requirements.txt
 %doc %{_defaultdocdir}/cloud-init/*
 
 # Configs
@@ -180,7 +183,7 @@
 %dir                    %{_sysconfdir}/cloud/templates
 %config(noreplace)      %{_sysconfdir}/cloud/templates/*
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init
+%dir /var/lib/cloud
 
 # Python code is here...
 %{python_sitelib}/*