diff --git a/cloud-init-tmpfiles.conf b/cloud-init-tmpfiles.conf index a42bcbf47b56e9d79b10b494ba084c27ff37ef1e..0c6d2a3be841d2fbd0d7fc70e7fc1ca30a1aa7cb 100644 --- a/cloud-init-tmpfiles.conf +++ b/cloud-init-tmpfiles.conf @@ -1 +1 @@ -d /run/cloud-init 0700 root root - - \ No newline at end of file +d /run/cloud-init 0700 root root - - diff --git a/cloud-init.spec b/cloud-init.spec index 983de5b9938403f62668f3244602d17a9d3cf01d..913686c1f6ab7786a4240114ff82bf5a083740cc 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 17.1 -Release: 9 +Release: 10 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -30,7 +30,7 @@ BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2 BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema BuildRequires: python3-mock python3-nose python3-oauthlib python3-prettytable BuildRequires: python3-pyserial python3-PyYAML python3-requests python3-six -BuildRequires: python3-unittest2 dnf +BuildRequires: python3-unittest2 dnf %{_vendor}-release Requires: e2fsprogs iproute python3-libselinux net-tools python3-policycoreutils Requires: procps python3-configobj python3-jinja2 python3-jsonpatch xfsprogs @@ -48,8 +48,10 @@ initialization of a cloud instance. %prep %autosetup -n %{name}-%{version} -p1 +echo %{_vendor} sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ -e 's|#!/usr/bin/python|#!/usr/bin/python3|' tools/* cloudinit/ssh_util.py +sed -i 's/\/etc\/redhat-release/\/etc\/%{_vendor}-release/g' setup.py %build %py3_build @@ -91,7 +93,7 @@ elif [ $1 -eq 2 ]; then fi %postun -%systemd_postun +%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service %files %doc ChangeLog @@ -126,6 +128,12 @@ fi %exclude /usr/share/doc/* %changelog +* Thu Oct 31 2019 chengquan - 17.1-10 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix %postun marco and change OS realease + * Tue Oct 22 2019 openEuler Buildteam - 17.1-9 - Package rebuild.