From 106bb9faa3e519a761eba06111bfad1fdd3b6b7e Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Thu, 7 Nov 2013 14:06:43 +0100
Subject: [PATCH] - Fixing pidof compilation warnings - RPM workaround -
 changing sysvinit-tools Conflicts/Obsoletes (#1026504)

---
 procps-ng-3.3.8-pidof-warnings.patch | 24 ++++++++++++++++++++++++
 procps-ng.spec                       | 11 ++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 procps-ng-3.3.8-pidof-warnings.patch

diff --git a/procps-ng-3.3.8-pidof-warnings.patch b/procps-ng-3.3.8-pidof-warnings.patch
new file mode 100644
index 0000000..437f6d7
--- /dev/null
+++ b/procps-ng-3.3.8-pidof-warnings.patch
@@ -0,0 +1,24 @@
+diff -Naur procps-ng-3.3.8.orig/pidof.c procps-ng-3.3.8/pidof.c
+--- procps-ng-3.3.8.orig/pidof.c	2013-11-04 16:10:02.000000000 +0100
++++ procps-ng-3.3.8/pidof.c	2013-11-04 16:14:27.217193613 +0100
+@@ -133,7 +133,7 @@
+ {
+ 	PROCTAB *ptp;
+ 	proc_t task;
+-	int match, root_check_ok;
++	int match;
+ 	static int size = 0;
+ 	char *cmd_arg0, *cmd_arg0base;
+ 	char *cmd_arg1, *cmd_arg1base;
+@@ -351,9 +351,9 @@
+ 			for (i = proc_count - 1; i >= 0; i--) {	/* and display their PIDs */
+ 				if (first_pid) {
+ 					first_pid = 0;
+-					printf ("%ld", procs[i].pid);
++					printf ("%ld", (long) procs[i].pid);
+ 				} else {
+-					printf (" %ld", procs[i].pid);
++					printf (" %ld", (long) procs[i].pid);
+ 				}
+ 				if (opt_single_shot) break;
+ 			}
diff --git a/procps-ng.spec b/procps-ng.spec
index b2b960c..a498e19 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -4,7 +4,7 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -26,6 +26,7 @@ Patch10: pgrep-introduce_support_for_namespaces.patch
 Patch11: skill-support_namespaces.patch
 Patch12: procps-fix_the_fatal_make_dist_error_for_nsutils.patch
 Patch13: procps-ng-3.3.8-pidof.patch
+Patch14: procps-ng-3.3.8-pidof-warnings.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -51,8 +52,7 @@ Provides: /sbin/sysctl
 Provides: /bin/ps
 
 # sysvinit removal in Fedora 21
-Conflicts: sysvinit-tools < 0:2.88-14
-Obsoletes: sysvinit-tools > 0:2.88-14
+Obsoletes: sysvinit-tools < 0:2.89
 Provides: /sbin/pidof
 
 
@@ -104,6 +104,7 @@ System and process monitoring utilities development headers
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 
 %build
@@ -173,6 +174,10 @@ install -pm755 %{SOURCE1} %{buildroot}%{_sbindir}
 %{_includedir}/proc
 
 %changelog
+* Mon Nov 04 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.8-17
+- Fixing pidof compilation warnings
+- RPM workaround - changing sysvinit-tools Conflicts/Obsoletes (#1026504)
+
 * Wed Oct 16 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.8-16
 - Introducing pidof (#987064)