From 87c034f35073109c86d7009099e8bcc16deed257 Mon Sep 17 00:00:00 2001 From: songnannan Date: Thu, 9 Apr 2020 21:41:44 +0800 Subject: [PATCH 1/2] add openEuler in the conditional branch --- initscripts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 43a3df4..411cffd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -20,7 +20,7 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts Version: 10.01 -Release: 6 +Release: 7 License: GPLv2 @@ -74,7 +74,7 @@ Obsoletes: %{name} < 9.82-2 # Downstream patches for RHEL -- patches that we keep only in RHEL for various # --------------------------- reasons, but are not enabled in Fedora: -%if %{defined rhel} || %{defined centos} +%if %{defined rhel} || %{defined centos} || !%{openEuler} #Patch200: example200.patch %endif @@ -361,6 +361,9 @@ fi # ============================================================================= %changelog +* Thu Apr 9 2020 songnannan - 10.01-7 +- add openEuler in the conditional branch + * Thu Mar 5 2020 openEuler Buildteam - 10.01-6 - Type:bugfix - ID:NA -- Gitee From 509b13b45e32d2588381607badcedc90d6e60bb6 Mon Sep 17 00:00:00 2001 From: songnannan Date: Thu, 9 Apr 2020 21:43:22 +0800 Subject: [PATCH 2/2] add openEuler in the conditional branch --- initscripts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 411cffd..740e7e8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -74,7 +74,7 @@ Obsoletes: %{name} < 9.82-2 # Downstream patches for RHEL -- patches that we keep only in RHEL for various # --------------------------- reasons, but are not enabled in Fedora: -%if %{defined rhel} || %{defined centos} || !%{openEuler} +%if %{defined rhel} || %{defined centos} || %{defined openEuler} #Patch200: example200.patch %endif -- Gitee