From 8fbabb85ecdd2b17bf061be6abb9d7e8e02e21e7 Mon Sep 17 00:00:00 2001 From: gnaygnil Date: Thu, 12 Mar 2020 12:12:50 +0800 Subject: [PATCH] podman: Fixed install fail --- README.en.md | 36 ------------------------------------ README.md | 39 --------------------------------------- podman.spec | 7 +++++-- 3 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 README.en.md delete mode 100644 README.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index bb8e0e2..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# podman - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 71928c8..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# podman - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/podman.spec b/podman.spec index 277b197..ab55108 100644 --- a/podman.spec +++ b/podman.spec @@ -1,6 +1,6 @@ Name: podman Version: 0.10.1 -Release: 2 +Release: 3 Summary: A daemonless container engine for managing Containers Epoch: 1 License: ASL 2.0 @@ -9,7 +9,7 @@ Source0: https://github.com/containers/libpod/archive/e4a155328fb88590fafd BuildRequires: compiler(go-compiler) btrfs-progs-devel glib2-devel glibc-devel glibc-static BuildRequires: git go-md2man gpgme-devel libassuan-devel libgpg-error-devel libseccomp-devel BuildRequires: libselinux-devel ostree-devel pkgconfig make -Requires: runc containers-common containernetworking-plugins >= 0.7.3-2 iptables nftables conmon +Requires: docker-runc containers-common containernetworking-plugins >= 0.7.3-2 iptables nftables conmon Recommends: container-selinux >= 2:2.71 slirp4netns Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 19f72df4d05d31cbe1c56bfc8045c96babff6c7e @@ -209,5 +209,8 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf %{_mandir}/man5/*.5* %changelog +* Thu Mar 12 2020 Ling Yang - 1:0.10.1-3 +- Fixed install fail + * Mon Dec 2 2019 shijian - 1:0.10.1-2 - Package init -- Gitee