Notification time stamped 2022-06-29 22:38:50 UTC
From 2cab69f4448b45c764a007e8f09226bf035c236b Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans(a)cottsay.net>
Date: Jun 29 2022 21:38:24 +0000
Subject: New upstream release 2.12.11
---
diff --git a/.gitignore b/.gitignore
index 33d10fd..3bd4008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
/lttng-tools-2.12.3.tar.bz2.asc
/lttng-tools-2.12.4.tar.bz2
/lttng-tools-2.12.4.tar.bz2.asc
+/lttng-tools-2.12.11.tar.bz2
+/lttng-tools-2.12.11.tar.bz2.asc
diff --git a/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
b/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
deleted file mode 100644
index b0d99c7..0000000
--- a/0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 307f5e8b83332cd05692bf2b648c3888681f3e3c Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson(a)efficios.com>
-Date: Tue, 11 May 2021 10:29:50 -0400
-Subject: [PATCH lttng-tools] tests: Move tap-driver.sh out of the autotools
- aux directory
-
-We have made local modifications to this script, move it to the test
-suite directory so it doesn't get overwritten by an updated version from
-autotools.
-
-Running 'make check' on current RHEL or Fedora without this patch
-results in the following error:
-
- make[5]: Entering directory
'/builddir/build/BUILD/lttng-tools-2.12.4/tests/regression'
- tap-driver.sh: invalid option: '--post-script'
-
-Change-Id: I22823176cc5b98901865c9415250ce8e49384cbd
-Signed-off-by: Michael Jeanson <mjeanson(a)efficios.com>
----
- configure.ac | 2 --
- tests/regression/Makefile.am | 2 +-
- tests/unit/Makefile.am | 2 +-
- tests/utils/Makefile.am | 2 +-
- {config => tests/utils}/tap-driver.sh | 0
- 5 files changed, 3 insertions(+), 5 deletions(-)
- rename {config => tests/utils}/tap-driver.sh (100%)
-
-diff --git a/configure.ac b/configure.ac
-index 9545673c8..572d319c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,8 +15,6 @@ AM_MAINTAINER_MODE([enable])
- # Enable silent rules if available (Introduced in AM 1.11)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--AC_REQUIRE_AUX_FILE([tap-driver.sh])
--
- # Checks for C compiler
- AC_USE_SYSTEM_EXTENSIONS
- AC_SYS_LARGEFILE
-diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
-index 0e9f2576b..73e49c997 100644
---- a/tests/regression/Makefile.am
-+++ b/tests/regression/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = tools kernel ust
-
- LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
- LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
-- $(top_srcdir)/config/tap-driver.sh
-+ $(top_srcdir)/tests/utils/tap-driver.sh
-
- TESTS = tools/base-path/test_ust \
- tools/filtering/test_invalid_filter \
-diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
-index 09de39e8c..87304176e 100644
---- a/tests/unit/Makefile.am
-+++ b/tests/unit/Makefile.am
-@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-
- LOG_DRIVER_FLAGS='--merge'
- LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-- $(top_srcdir)/config/tap-driver.sh
-+ $(top_srcdir)/tests/utils/tap-driver.sh
-
- TESTS = test_kernel_data \
- test_session \
-diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
-index 893b690ff..c74d10c06 100644
---- a/tests/utils/Makefile.am
-+++ b/tests/utils/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = . tap testapp
-
- EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh \
- parse-callstack.py
--dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
-+dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl tap-driver.sh
- noinst_LTLIBRARIES = libtestutils.la
-
- libtestutils_la_SOURCES = utils.c utils.h
-diff --git a/config/tap-driver.sh b/tests/utils/tap-driver.sh
-similarity index 100%
-rename from config/tap-driver.sh
-rename to tests/utils/tap-driver.sh
---
-2.25.1
-
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 405710a..599ec1b 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -8,8 +8,8 @@
Name: lttng-tools
-Version: 2.12.4
-Release: 4%{?dist}
+Version: 2.12.11
+Release: 1%{?dist}
License: GPLv2 and LGPLv2
URL:
http://lttng.org
Summary: LTTng control and utility programs
@@ -19,8 +19,6 @@ Source1:
http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2.as
Source2: gpgkey-7F49314A26E0DE78427680E05F1B2A0789F12B11.gpg
Source3: lttng-sessiond.service
-Patch0: 0001-tests-Move-tap-driver.sh-out-of-the-autotools-aux-di.patch
-
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -34,8 +32,8 @@ BuildRequires: systemtap-sdt-devel
BuildRequires: userspace-rcu-devel >= 0.9.0
# For check
-BuildRequires: babeltrace
-BuildRequires: procps-ng
+#BuildRequires: babeltrace
+#BuildRequires: procps-ng
Requires(pre): shadow-utils
Requires(post): systemd
@@ -178,6 +176,10 @@ exit 0
%endif
%changelog
+* Tue Jun 28 2022 Scott K Logan <logans(a)cottsay.net> - 2.12.11-1
+- New upstream release
+- Drop unused check section and dependencies
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.4-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 317149f..7d780cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (lttng-tools-2.12.4.tar.bz2) =
8df3c88c7e01a41c2a5e1d80f6791c278be8b7483dd0c4f3357a9b611248beeefff4b7a02afb308550a8e91e188c5d5625a55ffa1de85c49a3a192bb33552dfc
-SHA512 (lttng-tools-2.12.4.tar.bz2.asc) =
9eb79ce50382620f575644dde037d837864c57fd76f00749d3e4d0e7820e9c72d3d9467e3afd9ba8ddde7f7e55978327e63276335d941cc18fbdef9223b9cfbb
+SHA512 (lttng-tools-2.12.11.tar.bz2) =
c1ff07831508848ede2a69a4350ba6eeef2b9bea0faa9de4a3d9e8a0df81e22258d25131ccab57d1800fcac239a4bc25aa66d5d421d9e5c76d7cb6b9794ae4cd
+SHA512 (lttng-tools-2.12.11.tar.bz2.asc) =
9708d06df5c78efac8d8bcbd4f059055334cd469d942224efa6c802e26d27845cd16e6acc331bc1e4f8e888e3da32c5b6a29277dd81d29aec424e14fad7aa802
https://src.fedoraproject.org/rpms/lttng-tools/c/2cab69f4448b45c764a007e8...