From aad13c52c2516fe4d2a3fc623e3fcfd0a10fb16c Mon Sep 17 00:00:00 2001 From: songnannan Date: Sat, 21 Mar 2020 21:57:50 +0800 Subject: [PATCH] add obsoletes the yum utils --- README.en.md | 36 ------------------------------------ README.md | 39 --------------------------------------- generic-release.spec | 6 +++++- 3 files changed, 5 insertions(+), 76 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 0cb1eda..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# openEuler-release - -#### 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 5f47890..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# openEuler-release - -#### 介绍 -{**以下是码云平台说明,您可以替换此简介** -码云是 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/generic-release.spec b/generic-release.spec index e0864a6..f13ff82 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 32 +%define generic_release 33 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -29,6 +29,7 @@ Source3: 99-default-disable.preset BuildRequires: python Requires: %{product_family}-repos +Obsoletes: yum-utils yum-utils-help yum-utils-plugins %description %{product_family} release files @@ -135,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Sat Mar 21 2020 songnannan - 1.0-33 +- add obsoletes the yum utils + * Thu Mar 19 2020 openEuler Buildteam - 1.0-32 - change generic_release_1.0 -- Gitee