!22 Package init

Merge pull request !22 from 惊奇脆片饼干/init
This commit is contained in:
openeuler-ci-bot 2019-12-03 18:40:51 +08:00 committed by Gitee
commit b508cd6d06
2 changed files with 12 additions and 4 deletions

View File

@ -1 +1 @@
d /run/cloud-init 0700 root root - - d /run/cloud-init 0700 root root - -

View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 17.1 Version: 17.1
Release: 9 Release: 10
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init 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-jinja2 python3-jsonpatch python3-jsonschema
BuildRequires: python3-mock python3-nose python3-oauthlib python3-prettytable BuildRequires: python3-mock python3-nose python3-oauthlib python3-prettytable
BuildRequires: python3-pyserial python3-PyYAML python3-requests python3-six 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: e2fsprogs iproute python3-libselinux net-tools python3-policycoreutils
Requires: procps python3-configobj python3-jinja2 python3-jsonpatch xfsprogs Requires: procps python3-configobj python3-jinja2 python3-jsonpatch xfsprogs
@ -48,8 +48,10 @@ initialization of a cloud instance.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
echo %{_vendor}
sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ 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 -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 %build
%py3_build %py3_build
@ -91,7 +93,7 @@ elif [ $1 -eq 2 ]; then
fi fi
%postun %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 %files
%doc ChangeLog %doc ChangeLog
@ -126,6 +128,12 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Thu Oct 31 2019 chengquan <chengquan3@huawei.com> - 17.1-10
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix %postun marco and change OS realease
* Tue Oct 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 17.1-9 * Tue Oct 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 17.1-9
- Package rebuild. - Package rebuild.