From ad959dab4511f0136f3fc72c2bcbd67057f6f88f Mon Sep 17 00:00:00 2001 From: wu-leilei Date: Fri, 18 Nov 2022 11:00:13 +0800 Subject: [PATCH] The keyword openEuler is deleted from the patch name (cherry picked from commit eb9681d417619e04ce4a6b8f422556851e2851f3) --- ...peneuler.patch => fix-obsapisetup-script-problems.patch | 2 +- obs-server.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) rename Adapt-setup-appliance.sh-for-openeuler.patch => fix-obsapisetup-script-problems.patch (95%) diff --git a/Adapt-setup-appliance.sh-for-openeuler.patch b/fix-obsapisetup-script-problems.patch similarity index 95% rename from Adapt-setup-appliance.sh-for-openeuler.patch rename to fix-obsapisetup-script-problems.patch index 1de4dd3..2accefa 100644 --- a/Adapt-setup-appliance.sh-for-openeuler.patch +++ b/fix-obsapisetup-script-problems.patch @@ -1,7 +1,7 @@ From 804c99034ac187f00875a5324ee2a13251d3fc98 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Thu, 23 Sep 2021 09:53:06 +0800 -Subject: [PATCH] Adapt setup-appliance.sh for openeuler +Subject: [PATCH] fix obsapisetup script problems --- dist/setup-appliance.sh | 4 ++-- diff --git a/obs-server.spec b/obs-server.spec index a2fcacf..d3fd2fa 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 1 +Release: 2 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -19,7 +19,7 @@ Patch2: fix-obs_productconvert-inputfile-path.patch Patch4: 0004-remove-systemV-method.patch Patch5: 0005-obsscheduler-stop.patch Patch6: obs_project_update-should-tell-the-usage-but-not-hung-still.patch -Patch7: Adapt-setup-appliance.sh-for-openeuler.patch +Patch7: fix-obsapisetup-script-problems.patch BuildArch: noarch @@ -517,6 +517,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Thu Nov 17 2022 wulei - 2.10.15-2 +- The keyword openEuler is deleted from the patch name + * Thu Oct 27 2022 liyanan - 2.10.15-1 - Upgrade to version 2.10.15 -- Gitee