From 1897fc80874b6a01282bee1512170268e365dc83 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 13 Oct 2014 15:29:10 -0700 Subject: Fix the rpm building (currently broken) --- packages/redhat/cloud-init.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'packages/redhat/cloud-init.spec.in') diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 0e9862d8..05458271 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,9 @@ mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d 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 @@ fi /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 @@ 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 +%dir /var/lib/cloud # Python code is here... %{python_sitelib}/* -- cgit v1.2.3 From fdbf0c166df12fbbd0ff35f33422ab631b72890f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 17 Oct 2014 15:55:03 -0700 Subject: More spec file tweaks - Use _libexecdir for the helper binaries - Use _sharedstatedir instead of /var/lib - Ensure _libexecdir/${name} exists --- packages/redhat/cloud-init.spec.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/redhat/cloud-init.spec.in') diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 05458271..75faf8d8 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -92,8 +92,12 @@ 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 -mkdir -p \$RPM_BUILD_ROOT/var/lib/cloud + +# Required dirs... +mkdir -p \$RPM_BUILD_ROOT/%{_sharedstatedir}/cloud +mkdir -p \$RPM_BUILD_ROOT/%{_libexecdir}/%{name} %clean rm -rf \$RPM_BUILD_ROOT @@ -164,12 +168,8 @@ 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 LICENSE ChangeLog requirements.txt -- cgit v1.2.3 From 18d27181905f4474d9b338f1e756b3cadd7c6e57 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 17 Oct 2014 15:57:09 -0700 Subject: Ensure the files/dirs are retained --- packages/redhat/cloud-init.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/redhat/cloud-init.spec.in') diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 75faf8d8..2625d90e 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -183,7 +183,9 @@ fi %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf -%dir /var/lib/cloud + +%{_libexecdir}/%{name} +%dir %{_sharedstatedir}/cloud # Python code is here... %{python_sitelib}/* -- cgit v1.2.3 From 7d20f3843bff0069b1ac9b2f0c6d346889789058 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 17 Oct 2014 16:24:19 -0700 Subject: Use TODO.rst instead of removing it --- packages/redhat/cloud-init.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/redhat/cloud-init.spec.in') diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 2625d90e..49bd880b 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -172,7 +172,7 @@ fi %{_libexecdir}/%{name}/write-ssh-key-fingerprints # Docs -%doc LICENSE ChangeLog requirements.txt +%doc LICENSE ChangeLog TODO.rst requirements.txt %doc %{_defaultdocdir}/cloud-init/* # Configs -- cgit v1.2.3