From 1d612b15b2216f3206b6853589c0f54638b8280a Mon Sep 17 00:00:00 2001 From: x30004928 Date: Tue, 6 Sep 2022 14:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0multi=20version=E5=88=86?= =?UTF-8?q?=E6=94=AF=E7=94=A8=E4=BA=8Eobs-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- obs-server.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/obs-server.spec b/obs-server.spec index c7011d3..8803ed6 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,7 +5,7 @@ Name: obs-server Version: 2.10.11 -Release: 4 +Release: 5 Summary: The Open Build Service -- Server Component License: GPL-2.0-only or GPL-3.0-only URL: http://www.openbuildservice.org @@ -23,10 +23,10 @@ Patch9: Adapt-setup-appliance.sh-for-openeuler.patch BuildArch: noarch -BuildRequires: python-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Compress-Zlib, xz +BuildRequires: python3-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Compress-Zlib, xz BuildRequires: perl-File-Sync >= 0.10, perl-JSON-XS, perl-Net-SSLeay, perl-Socket-MsgHdr, nodejs BuildRequires: perl-TimeDate, perl-XML-Parser, perl-XML-Simple, perl-YAML-LibYAML, procps, tzdata -BuildRequires: rubygem-bundler, rubygem-rake, obs-bundled-gems, rubygem-bigdecimal, perl(Test::Simple) > 1 +BuildRequires: rubygem-bundler, rubygem-rake <= 12.3.1, obs-bundled-gems, rubygem-bigdecimal <= 1.4, perl(Test::Simple) > 1 Requires(pre): obs-common Requires: build >= 20191114, perl-BSSolv, perl(Date::Parse), diffutils, git-core, patch @@ -65,8 +65,8 @@ This is a package providing basic configuration files. %package -n obs-api Summary: The Open Build Service -- The API and WEBUI -Requires: httpd, apache2-mod_xforward, rubygem-passenger, mod_passenger >= 6.0.4 -Requires: ruby, nodejs, urw-base35-fonts-legacy, obs-api-deps = 2.10.1 +Requires: httpd, apache2-mod_xforward, rubygem-passenger <= 6.0.9, mod_passenger >= 6.0.4 +Requires: ruby <= 2.5.9, nodejs, urw-base35-fonts-legacy, obs-api-deps = 2.10.1 Requires: obs-bundled-gems = 2.10.1 Conflicts: memcached < 1.4 @@ -493,6 +493,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Tue Sep 06 2022 xiangyuning - 2.10.11-5 +- add multi version branch for obs-server + * Thu May 26 2022 caodongxia - 2.10.11-4 - Fix obs-api install warning -- Gitee