cloud-init-dev team mailing list archive

[Guido Günther <agx@xxxxxxxxxxx>]

Guido Günther has proposed merging lp:~agx/cloud-init/sles12 into lp:cloud-init.

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

For more details, see:
https://code.launchpad.net/~agx/cloud-init/sles12/+merge/276428

Fix RPM build on SLES12
 
Handle systemd and add missing files.

This unbreaks

    ./packges/bdist-rpm --distro=suse
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~agx/cloud-init/sles12 into lp:cloud-init.

=== modified file 'packages/brpm'
--- packages/brpm	2015-05-19 12:16:46 +0000
+++ packages/brpm	2015-11-02 17:19:00 +0000
@@ -51,6 +51,7 @@
         'argparse': 'python-argparse',
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
+        'jinja2': 'python-Jinja2',
         'jsonpatch': 'python-jsonpatch',
         'oauthlib': 'python-oauthlib',
         'prettytable': 'python-prettytable',

=== modified file 'packages/suse/cloud-init.spec.in'
--- packages/suse/cloud-init.spec.in	2014-01-31 13:15:40 +0000
+++ packages/suse/cloud-init.spec.in	2015-11-02 17:19:00 +0000
@@ -107,7 +107,7 @@
 # Move documentation
 mkdir -p %{buildroot}/%{_defaultdocdir}
 mv %{buildroot}/usr/share/doc/cloud-init %{buildroot}/%{_defaultdocdir}
-for doc in TODO LICENSE ChangeLog requirements.txt; do
+for doc in TODO.rst LICENSE ChangeLog requirements.txt; do
    cp \${doc} %{buildroot}/%{_defaultdocdir}/cloud-init
 done
 
@@ -133,6 +133,11 @@
    %{_sbindir}/rccloud-*
 %endif
 
+%if %{initsys} == systemd
+%{_unitdir}/cloud-*
+%endif
+
+
 # Program binaries
 %{_bindir}/cloud-init*
 
@@ -142,6 +147,9 @@
 /usr/lib/%{name}/uncloud-init
 /usr/lib/%{name}/write-ssh-key-fingerprints
 
+# Udev rules
+/lib/udev/rules.d/*.rules
+
 # Docs
 %doc %{_defaultdocdir}/cloud-init/*