diff --git a/0001-obs_server-fix-usage-info.patch b/0001-obs_server-fix-usage-info.patch new file mode 100644 index 0000000000000000000000000000000000000000..1cf5094f6e138ed67a9dd5f49c776c8dce683152 --- /dev/null +++ b/0001-obs_server-fix-usage-info.patch @@ -0,0 +1,32 @@ +From 7da5dc099e9d4f170e35c87e2f2dd7a0a38180b3 Mon Sep 17 00:00:00 2001 +From: Zhiqiang Liu +Date: Fri, 18 Sep 2020 15:17:38 +0800 +Subject: [PATCH] obs_server: fix usage info + +when we exec 'obs_serverstatus' command without other pargs, +the return usage message is 'Usage: bs_serverstatus [--top] '. +However, the 'bs_serverstatus' is different with input 'obs_serverstatus'. + +Here, we change the usage info to 'Usage: obs_serverstatus [--top] '. + +Signed-off-by: Zhiqiang Liu +--- + src/backend/bs_serverstatus | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/bs_serverstatus b/src/backend/bs_serverstatus +index 0ec50b3..139f15e 100755 +--- a/src/backend/bs_serverstatus ++++ b/src/backend/bs_serverstatus +@@ -44,7 +44,7 @@ while (@ARGV) { + last; + } + } +-die("Usage: bs_serverstatus [--top] \n") unless $ARGV[0]; ++die("Usage: obs_serverstatus [--top] \n") unless $ARGV[0]; + $| = 1; + print "\033[H\033[J" if $top; + my $nl = "\n"; +-- +1.8.3.1 + diff --git a/obs-server.spec b/obs-server.spec index f8c5dedea5231f1a7fa5cec40ff9df3104e54845..189c082438b1d1c15e6eead55d75f180d866954b 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,12 +6,15 @@ Name: obs-server Version: 2.10.1 -Release: lp151.23.4 +Release: lp151.23.5 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: open-build-service-%version.tar.xz + +Patch1: 0001-obs_server-fix-usage-info.patch + BuildArch: noarch BuildRequires: python-devel, /usr/bin/xmllint, openssl, perl-BSSolv >= 0.36, perl-Compress-Zlib, xz @@ -477,6 +480,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Fri Sep 18 2020 Zhiqiang Liu - 2.10.1-lp151.23.5 +- correct usage info when exec 'obs_serverstatus' without other pargs + * Fri Sep 18 2020 lingsheng - 2.10.1-lp151.23.4 - Add missing macros