prep for 3.1.2

diff --git a/ChangeLog b/ChangeLog
index dbdf3f005ebffb8948cb4dad0694dd8ab3bfdd1d..818a900afbba6f0be7b7a721f850dd54c5215435 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+procps-3.1.1 --> procps-3.1.2
+
+better RPM generation
+general C99 clean-up
+some seLinux fixes
+now count Inact_laundry as needed  #172163
+ps: fewer globals
+ps: hardware-enforced buffer protection
+ps: smaller (was it 1 kB or 2 kB ?)
+top: B command added (for bold on/off)
+top: handle old (and future) config files
+top: man page tweak
+top: old sort keys     #167249
+top: out-of-bounds RT as "RT"
+top: several times faster
+top: t command fixed
+vmstat: -f
+vmstat: -s
+w: much faster
+watch: don't drop empty lines   #171005
+watch: re-indented
+
 procps-3.1.0 --> procps-3.1.1
 
 vmstat faster on 2.5.xx kernels

diff --git a/Makefile b/Makefile
index de25c476d23f00c770511a7b6652cf899f4d12b7..e34fc5ba5dfb89ac651dd2f4e712f1766cc72495 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@
 
 VERSION      := 3
 SUBVERSION   := 1
-MINORVERSION := 1
-TARVERSION   := 3.1.1
-LIBVERSION   := 3.1.1
+MINORVERSION := 2
+TARVERSION   := 3.1.2
+LIBVERSION   := 3.1.2
 
 ############ vars
 

diff --git a/NEWS b/NEWS
index 0cc73473026e3400fe8b164be353ec5986cacb3e..818a900afbba6f0be7b7a721f850dd54c5215435 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ procps-3.1.1 --> procps-3.1.2
 better RPM generation
 general C99 clean-up
 some seLinux fixes
+now count Inact_laundry as needed  #172163
 ps: fewer globals
 ps: hardware-enforced buffer protection
 ps: smaller (was it 1 kB or 2 kB ?)

diff --git a/procps.lsm b/procps.lsm
index c4c64af28b0e3ed71607a7f5dc4e66bedddb6447..6f4ca8b02a1dff2f092be6191aa56b14ce2c8d7b 100644 (file)
--- a/procps.lsm
+++ b/procps.lsm
@@ -1,15 +1,15 @@
 Begin4
 Title: procps
-Version: 3.1.1
-Entered-date: 2002-19-11
+Version: 3.1.2
+Entered-date: 2002-12-08
 Description: Linux system utilities
 Keywords: procps /proc libproc sysctl pmap
        ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
 Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
 Maintained-by: various <procps-feedback@lists.sf.net>
 Primary-site: http://procps.sf.net/
-       230kB procps-3.1.1.tar.gz
+       230kB procps-3.1.2.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
-       230kB procps-3.1.1.tar.gz
+       230kB procps-3.1.2.tar.gz
 Copying-policy: mixed
 End

diff --git a/procps.spec b/procps.spec
index 8f7f2bce890cdf8bc8822be02de4620d5d99c292..e781c6de29d82bda4d6325f0a4b1a945d583b139 100644 (file)
--- a/procps.spec
+++ b/procps.spec
@@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
 Name: procps
 %define major_version 3
 %define minor_version 1
-%define revision 1
+%define revision 2
 %define version %{major_version}.%{minor_version}.%{revision}
 Version: %{version}
 Release: 1