diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-10-17 15:55:03 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-10-17 15:55:03 -0700 |
| commit | fdbf0c166df12fbbd0ff35f33422ab631b72890f (patch) | |
| tree | a8371fcad6b57d4be9cccabfe72f4583522efe0a /packages/redhat | |
| parent | ad943eb7d3e3b38d0689a9276040a539270f11f0 (diff) | |
| download | vyos-cloud-init-fdbf0c166df12fbbd0ff35f33422ab631b72890f.tar.gz vyos-cloud-init-fdbf0c166df12fbbd0ff35f33422ab631b72890f.zip | |
More spec file tweaks
- Use _libexecdir for the helper binaries
- Use _sharedstatedir instead of /var/lib
- Ensure _libexecdir/${name} exists
Diffstat (limited to 'packages/redhat')
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 14 |
1 files changed, 7 insertions, 7 deletions
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 |