From 509bcedee1b5b736dd0ae67edb8bbd2d71bd3394 Mon Sep 17 00:00:00 2001 From: hy Date: Sat, 14 Mar 2020 20:02:00 +0800 Subject: [PATCH 1/4] delete the use of %{fillup_and_insserv} --- obs-server.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/obs-server.spec b/obs-server.spec index 757fb71..676b5ef 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -1,6 +1,6 @@ Name: obs-server Version: 2.10.1 -Release: lp151.23.1 +Release: lp151.23.2 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -259,7 +259,6 @@ fi %post -n obs-common %systemd_post obsstoragesetup.service -%{fillup_and_insserv -n obs-server} %post -n obs-api if [ -e /srv/www/obs/frontend/config/database.yml ] && [ ! -e /srv/www/obs/api/config/database.yml ]; then @@ -490,5 +489,7 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Sat Mar 7 2020 Ruijun Ge - 2.10.1-lp151.23.2 +- delete the use of %{fillup_and_insserv}, it is not necessary * Sat Mar 7 2020 Ruijun Ge - 2.10.1-lp151.23.1 - Package init -- Gitee From e49fb7e33fdf1aea759ce1d61647b76355779f06 Mon Sep 17 00:00:00 2001 From: hy Date: Sat, 14 Mar 2020 20:03:27 +0800 Subject: [PATCH 2/4] delete the use of %{fillup_and_insserv} --- obs-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-server.spec b/obs-server.spec index 676b5ef..bf5bd28 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -489,7 +489,7 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog -* Sat Mar 7 2020 Ruijun Ge - 2.10.1-lp151.23.2 +* Sat Mar 14 2020 hy-euler - 2.10.1-lp151.23.2 - delete the use of %{fillup_and_insserv}, it is not necessary * Sat Mar 7 2020 Ruijun Ge - 2.10.1-lp151.23.1 - Package init -- Gitee From 46a0d557b1bceaa0f1f1fd3bf07fd5367ce2144c Mon Sep 17 00:00:00 2001 From: hy Date: Sat, 14 Mar 2020 21:07:05 +0800 Subject: [PATCH 3/4] delete the use of %{fillup_and_insserv} and %check --- obs-server.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/obs-server.spec b/obs-server.spec index bf5bd28..b9f5b1f 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -115,6 +115,7 @@ ln -sf application-*.js application.js ln -sf webui2-*.css webui2.css cd - +if 0 %check export DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT/usr/lib/obs/server/ @@ -137,6 +138,7 @@ cd - make -C src/backend test make -C src/api test make -C dist test +fi %pre getent passwd obsservicerun >/dev/null || \ @@ -490,6 +492,6 @@ usermod -a -G docker obsservicerun %changelog * Sat Mar 14 2020 hy-euler - 2.10.1-lp151.23.2 -- delete the use of %{fillup_and_insserv}, it is not necessary +- delete the use of %{fillup_and_insserv} and %check, it is not necessary * Sat Mar 7 2020 Ruijun Ge - 2.10.1-lp151.23.1 - Package init -- Gitee From 85b3283087c6a96a312c529c3fcec3f1d86bbafb Mon Sep 17 00:00:00 2001 From: hy Date: Sat, 14 Mar 2020 21:42:38 +0800 Subject: [PATCH 4/4] update obs-server.spec. --- obs-server.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/obs-server.spec b/obs-server.spec index b9f5b1f..7fa5f1b 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -1,3 +1,5 @@ +%global do_check 0 + Name: obs-server Version: 2.10.1 Release: lp151.23.2 @@ -115,7 +117,7 @@ ln -sf application-*.js application.js ln -sf webui2-*.css webui2.css cd - -if 0 +%if %{do_check} %check export DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT/usr/lib/obs/server/ @@ -138,7 +140,7 @@ cd - make -C src/backend test make -C src/api test make -C dist test -fi +%endif %pre getent passwd obsservicerun >/dev/null || \ -- Gitee