From 7582cf4365ae5d49a66c6acb70e62d42a60d4c97abac8c6bdb4a091d854e64fa Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 18 Mar 2014 19:43:58 +0000 Subject: [PATCH] - include the LICENSE - add dependency on growpart to aupport root partition expansion OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=8 --- cloud-init.changes | 7 ++++++- cloud-init.spec | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index da03a4a..de9d920 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 18 15:01:51 UTC 2014 - rschweikert@suse.com + +- include the LICENSE + ------------------------------------------------------------------- Mon Mar 17 18:37:58 UTC 2014 - rschweikert@suse.com @@ -8,7 +13,7 @@ Mon Mar 17 18:37:58 UTC 2014 - rschweikert@suse.com ------------------------------------------------------------------- Mon Mar 17 17:58:23 UTC 2014 - rschweikert@suse.com -- add dependency n growpart to aupport root partition expansion +- add dependency on growpart to aupport root partition expansion ------------------------------------------------------------------- Mon Jan 20 17:51:24 UTC 2014 - dmueller@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index 730d498..b7f525d 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -120,15 +120,23 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/cloud mkdir -p %{buildroot}%{_defaultdocdir} mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{docdir} cp -a %{SOURCE1} %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg +# copy the LICENSE +cp LICENSE %{buildroot}%{docdir} # Set the distribution indicator %if 0%{?suse_version} %if 0%{?suse_version} < 1130 +#SLE 11, openSUSE 11.x is EOL sed -i s/INSERT_SUSE_DISTRO/sles/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg %endif %if 0%{?suse_version} > 1140 +%if 0%{?suse_version} == 1315 +# SLE 12 +sed -i s/INSERT_SUSE_DISTRO/sles/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg +%else sed -i s/INSERT_SUSE_DISTRO/opensuse/ %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg %endif %endif +%endif # remove debian/ubuntu specific profile.d file (bnc#779553) rm -f %{buildroot}%{_sysconfdir}/profile.d/Z99-cloud-locale-test.sh @@ -154,6 +162,8 @@ popd %files %defattr(-,root,root) +# do not mark as doc or we get conflicts with the doc package +%{docdir}/LICENSE %{_bindir}/cloud-init %{_bindir}/cloud-init-per %config(noreplace) %{_sysconfdir}/cloud/ @@ -177,10 +187,15 @@ popd %{systemd_prefix}/systemd/system/cloud-final.service %endif %dir %attr(0755, root, root) %{_localstatedir}/lib/cloud +%dir %{docdir} %files doc %defattr(-,root,root) -%doc %{docdir} +%{docdir}/examples/* +%{docdir}/README +%{docdir}/*.txt +%{docdir}/*.rst +%dir %{docdir}/examples %files test %defattr(-,root,root)