From c7367a880f60e0bcf98cc57ae05155f582c43932 Mon Sep 17 00:00:00 2001 From: gaohuatao Date: Thu, 12 Nov 2020 18:52:02 +0800 Subject: [PATCH] update from openeuler master Signed-off-by: gaohuatao --- 0001-ignore-proxy-envs.patch | 2 +- clibcni.spec | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/0001-ignore-proxy-envs.patch b/0001-ignore-proxy-envs.patch index 1e1770c..d33c0cc 100644 --- a/0001-ignore-proxy-envs.patch +++ b/0001-ignore-proxy-envs.patch @@ -37,5 +37,5 @@ index 96f0b81..f95d444 100644 i++; } -- -2.25.1 +2.20.1 diff --git a/clibcni.spec b/clibcni.spec index 3c09ddb..3583506 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.0.3 -%global _release 20201106.105935.gitfa07d6aa +%global _release 20201112.165252.gitc4aadda4 Name: clibcni Version: %{_version} Release: %{_release} @@ -10,7 +10,7 @@ URL: https://gitee.com/openeuler/clibcni Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version} -Patch9000: 0001-ignore-proxy-envs.patch +Patch9001: 0001-ignore-proxy-envs.patch BuildRequires: gcc BuildRequires: cmake @@ -39,7 +39,6 @@ Requires: %{name} = %{version}-%{release} %description devel the %{name}-libs package contains libraries for running %{name} applications. - %prep %autosetup -n %{name} -Sgit -p1 @@ -88,15 +87,14 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/%{name}.pc %changelog -* Fri Sep 04 2020 zhangxiaoyu - 2.0.3-20200904.104745.git413e6757 +* Thu Nov 12 2020 gaohuatao - 2.0.3-20201112.165252.gitc4aadda4 - Type:enhancement - ID:NA - SUG:NA -- DESC: upgrade from v2.0.2 to v2.0.3 +- DESC: update from openeuler master -* Wed Sep 02 2020 YoungJQ - 2.0.2-20200902.113625.git660192c5 +* Fri Sep 04 2020 zhangxiaoyu - 2.0.3-20200904.104745.git413e6757 - Type:enhancement - ID:NA - SUG:NA -- DESC: modify source0 address - +- DESC: upgrade from v2.0.2 to v2.0.3 -- Gitee