From b9171be7619aabea6f1306308b1cef1fb88799f9 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Wed, 26 Feb 2025 10:44:21 +0800 Subject: [PATCH] Replace mariadb-server with mysql-server (cherry picked from commit 8f35495f91858257a151562bd09608fbb058b04d) --- Gemfile.lock | 2 +- obs-bundled-gems.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ca7b41..02d9c41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -618,4 +618,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.4.10 + 2.4.19 diff --git a/obs-bundled-gems.spec b/obs-bundled-gems.spec index 1b80962..7f9a1e2 100644 --- a/obs-bundled-gems.spec +++ b/obs-bundled-gems.spec @@ -20,17 +20,18 @@ %global ruby_version 3.2.0 Name: obs-bundled-gems Version: 2.10.15 -Release: 10 +Release: 11 Summary: The Open Build Service -- Bundled Gems License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org Source0: Gemfile Source1: Gemfile.lock Source2: verdor.obscpio -BuildRequires: cyrus-sasl-devel mysql-devel nodejs openldap-devel python3-devel # https://rubygems.loongnix.cn/gems/ffi-1.15.5.gem Source5: ffi-1.15.5.gem +BuildRequires: cyrus-sasl-devel nodejs openldap-devel python3-devel +BuildRequires: pkgconfig(mysqlclient) > 21.2.33 BuildRequires: gcc gcc-c++ glibc-devel libtool libxml2-devel libxslt-devel BuildRequires: ruby-devel rubygem-bundler ruby-common make @@ -42,7 +43,7 @@ denpendent gems, and add them to spec file. Summary: Holding dependencies required to run the OBS frontend Requires: build >= 20170315 Requires: memcached >= 1.4 -Requires: mariadb-server +Requires: mysql-server Requires: obs-bundled-gems = %{version} Requires: sphinx >= 2.1.8 Requires: perl(GD) @@ -145,6 +146,9 @@ done %doc README %changelog +* Wed Feb 26 2025 wangkai <13474090681@163.com> - 2.10.15-11 +- Replace mariadb-server with mysql-server + * Thu Feb 20 2025 wangkai <13474090681@163.com> - 2.10.15-10 - Replace ruby-ldap with ruby-ldap3 to fix service failed -- Gitee