[procps] complete last commit

[Jan Görig]

commit ba86d21f9f2059bc847bf867ef47f431aad3ffc2
Author: Jan Görig <jgorig at redhat.com>
Date:   Thu Sep 23 16:14:10 2010 +0200

    complete last commit

 procps-3.2.8-constructor-order.patch |    4 ++--
 procps.spec                          |   25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/procps-3.2.8-constructor-order.patch b/procps-3.2.8-constructor-order.patch
index a318bd4..87b5a03 100644
--- a/procps-3.2.8-constructor-order.patch
+++ b/procps-3.2.8-constructor-order.patch
@@ -23,9 +23,9 @@ Adapted to Fedora: Jan Görig <jgorig at redhat.com>
 -static void init_Linux_version(void) __attribute__((constructor));
 -static void init_Linux_version(void) {
 +void init_Linux_version(void) {
+     static struct utsname uts;
      int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
-     FILE *fp;
-     char buf[256];
+     
 --- a/proc/version.h
 +++ b/proc/version.h
 @@ -14,6 +14,7 @@
diff --git a/procps.spec b/procps.spec
index 16d7da5..de379ff 100644
--- a/procps.spec
+++ b/procps.spec
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 10%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -12,10 +12,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-Patch1: procps-3.2.7-selinux.patch
+Patch1: procps-3.2.8-selinux.patch
 Patch2: procps-3.2.7-misc.patch
 Patch3: procps-3.2.7-FAQ.patch
-Patch4: procps-3.2.7-selinux-workaround.patch
 Patch6: procps-3.2.7-noproc.patch
 Patch7: procps-3.2.7-pseudo.patch
 Patch8: procps-3.2.7-0x9b.patch
@@ -26,8 +25,6 @@ Patch10: procps-3.2.7-top-rc.patch
 # 161303 - 'top' failed when remove cpus
 # 186017 - Top "Cpu0" line never updates on single processor machine
 Patch11: procps-3.2.7-top-remcpu.patch
-# Selinux
-Patch12: procps-3.2.7-libselinux.patch
 # 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
 Patch14: procps-3.2.7-top-env-vmsize.patch
 # 174619 - workaround for reliable Cpu(s) data in the first loop
@@ -53,8 +50,6 @@ Patch26: procps-3.2.7-ps-stime.patch
 Patch28: procps-3.2.7-ps-eip64.patch
 #244960 - ps manpage formatted incorrectly
 Patch29: procps-3.2.7-psman.patch
-#255441 - ldopen libselinux.so.1 instead of libselinux.so
-Patch30: procps-3.2.7-ps-libselinux.patch
 #185994 - error when using "Single Cpu = Off" option
 Patch31: procps-3.2.7-top-cpu0.patch
 #354001 - CPU value in top is reported as an integer
@@ -94,6 +89,10 @@ Patch47: procps-pmap-smaps.patch
 #Patch48: procps-3.2.7-vmstat-sm.patch
 Patch48: procps-3.2.8-vmstat-getopt.patch
 Patch49: procps-3.2.8-ps-cgroup-suppress-root-group.patch
+#631340 - fixed build with make 3.82
+Patch50: procps-3.2.8-make.patch
+#632236: don't depend on constructor execution order
+Patch51: procps-3.2.8-constructor-order.patch
 
 BuildRequires: ncurses-devel
 
@@ -124,14 +123,12 @@ working directory of a process or processes.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -144,7 +141,6 @@ working directory of a process or processes.
 %patch26 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
@@ -164,6 +160,8 @@ working directory of a process or processes.
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
+%patch51 -p1
 
 cp %SOURCE1 .
 
@@ -201,6 +199,13 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 23 2010 Jan Görig <jgorig at redhat.com> 3.2.8-12
+- merged selinux patches into procps-3.2.7-selinux.patch
+- fixed #632236 - don't depend on constructor execution order
+
+* Wed Sep 8 2010 Jan Görig <jgorig at redhat.com> 3.2.8-11
+- fixed build with make 3.82
+
 * Tue May 18 2010 Daniel Novotny <dnovotny at redhat.com> 3.2.8-10
 - added patch for cgroup display (supress root group)
   thanks to Lennart Poettering (#593267)