Prepare for 4.12 release

* NEWS: Update for 4.12 release.
* debian/changelog: 4.12-1.
* strace.spec: 4.12-1.

diff --git a/NEWS b/NEWS
index 31028e78ce1eb9124ba0e0a82c0f7885d897d394..4ffc90cbc945f82ce9665e708efee98fcd2ace5f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in release 4.12 (????-??-??)
+Noteworthy changes in release 4.12 (2016-05-31)
 ===============================================
 
 * Improvements

diff --git a/debian/changelog b/debian/changelog
index 9678870e91df19bf56085d97e71f09a4264d4664..89157c822b890283267aa501a924c5cd4608de22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+strace (4.12-1) unstable; urgency=low
+
+  [ Dmitry V. Levin ]
+  * New upstream version.
+    + implemented simultaneous use of -p option and tracing of a command,
+      closes: #549942
+    + fixed decoding of syscalls unknown to the kernel on s390/s390x,
+      closes: #485979
+
+ -- Dmitry V. Levin <ldv@altlinux.org>  Tue, 31 May 2016 11:12:13 +0000
+
 strace (4.11-1) unstable; urgency=low
 
   [ Dmitry V. Levin ]

diff --git a/strace.spec b/strace.spec
index 37fdd90816f474d0d9fcaba5af8d12481c55316d..2548d5593f125e9a38ebb757c95ab2c96f3067ad 100644 (file)
--- a/strace.spec
+++ b/strace.spec
@@ -1,8 +1,8 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.11.0.163.9720
-%define srcname %name-4.11.0.163-9720
-Release: 2%{?dist}
+Version: 4.12
+Release: 1%{?dist}
+%define srcname %name-%version
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -47,6 +47,16 @@ The `strace' program in the `strace' package is for 32-bit processes.
 %setup -q -n %{srcname}
 
 %build
+echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'
+uname -a |head -1
+libc="$(ldd /bin/sh |sed -n 's|^[^/]*\(/[^ ]*/libc\.so[^ ]*\).*|\1|p' |head -1)"
+$libc |head -1
+file -L /bin/sh
+gcc --version |head -1
+kver="$(echo -e '#include <linux/version.h>\nLINUX_VERSION_CODE' | gcc -E -P -)"
+printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
+echo 'END OF BUILD ENVIRONMENT INFORMATION'
+
 %configure
 make %{?_smp_mflags}
 
@@ -68,16 +78,10 @@ rm -f %{buildroot}%{_bindir}/strace-graph
 %endif
 
 %check
-uname -a |head -1
-libc="$(ldd /bin/sh |sed -n 's|^[^/]*\(/[^ ]*/libc\.so[^ ]*\).*|\1|p' |head -1)"
-$libc |head -1
-file -L /bin/sh
-gcc --version |head -1
-kver="$(echo -e '#include <linux/version.h>\nLINUX_VERSION_CODE' | gcc -E -P -)"
-printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
-export SLEEP_A_BIT='sleep 0.1'
 make %{?_smp_mflags} -k check VERBOSE=1
-cat tests/test-suite.log tests/ksysent.log
+echo 'BEGIN OF TEST SUITE INFORMATION'
+tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
+echo 'END OF TEST SUITE INFORMATION'
 
 %files
 %doc CREDITS ChangeLog ChangeLog-CVS COPYING NEWS README
@@ -91,6 +95,9 @@ cat tests/test-suite.log tests/ksysent.log
 %endif
 
 %changelog
+* Tue May 31 2016 Dmitry V. Levin <ldv@altlinux.org> - 4.12-1
+- 4.11.0.163.9720 -> 4.12.
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0.163.9720-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild