From 60c9ffcf933167c6d8dcadb6adf0b57a57e21bcd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 02 2021 06:14:09 +0000
Subject: import procps-ng-3.3.15-6.el8


---

diff --git a/SOURCES/procps-ng-3.3.15-pidof-separator-option-backport.patch b/SOURCES/procps-ng-3.3.15-pidof-separator-option-backport.patch
new file mode 100644
index 0000000..e70f10a
--- /dev/null
+++ b/SOURCES/procps-ng-3.3.15-pidof-separator-option-backport.patch
@@ -0,0 +1,13 @@
+diff --git a/pidof.c b/pidof.c
+index 7fdf27a..2166265 100644
+--- a/pidof.c
++++ b/pidof.c
+@@ -300,7 +300,7 @@ int main (int argc, char **argv)
+ 		{"check-root", no_argument, NULL, 'c'},
+ 		{"single-shot", no_argument, NULL, 's'},
+ 		{"omit-pid", required_argument, NULL, 'o'},
+-		{"separator", required_argument, NULL, 's'},
++		{"separator", required_argument, NULL, 'S'},
+ 		{"with-workers", no_argument, NULL, 'w'},
+ 		{"help", no_argument, NULL, 'h'},
+ 		{"version", no_argument, NULL, 'V'},
diff --git a/SPECS/procps-ng.spec b/SPECS/procps-ng.spec
index 7d5d8f9..84dd9f7 100644
--- a/SPECS/procps-ng.spec
+++ b/SPECS/procps-ng.spec
@@ -4,7 +4,7 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -20,6 +20,7 @@ Patch1: procps-ng-3.3.15-pidof-show-worker-threads.patch
 Patch2: procps-ng-3.3.15-pgrep-uid-conversion-overflow.patch
 Patch3: procps-ng-3.3.15-vmstat-watch-manpage.patch
 Patch4: procps-ng-3.3.15-pidof-kernel-workers-option.patch
+Patch5: procps-ng-3.3.15-pidof-separator-option-backport.patch
 
 BuildRequires: ncurses-devel
 BuildRequires: libtool
@@ -162,6 +163,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
 %files i18n -f %{name}.lang
 
 %changelog
+* Tue Dec 01 2020 Jan Rybar <jrybar@redhat.com> - 3.3.15-6
+- pidof: option for separator collides with other option
+- Resolves: rhbz#1895985
+
 * Mon Nov 09 2020 Jan Rybar <jrybar@redhat.com> - 3.3.15-5
 - version bump due to unspotted malformed backport patch
 - Resolves: rhbz#1860486