diff --git a/obs-server.spec b/obs-server.spec index c7011d32490c7d4f46bba8a8b553d542e1d278a3..463c03d1200054731d91d995922f27e5b06f6cb0 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 = 2.10.2, 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,9 +65,9 @@ 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: obs-bundled-gems = 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.2 +Requires: obs-bundled-gems = 2.10.2 Conflicts: memcached < 1.4 %description -n obs-api @@ -256,6 +256,10 @@ rmdir /srv/obs 2> /dev/null || : %systemd_postun_with_restart obsstoragesetup.service %pre -n obs-api +getent group www >/dev/null || /usr/sbin/groupadd -r www + +getent passwd wwwrun >/dev/null || /usr/sbin/useradd -d / -g www -s /sbin/nologin -r wwwrun + getent passwd obsapidelayed >/dev/null || \ /usr/sbin/useradd -r -s /bin/bash -c "User for build service api delayed jobs" -d /srv/www/obs/api -g apache obsapidelayed @@ -493,6 +497,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Fri Dec 23 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