[packages/lttng-ust] - up to 2.14.0 - java does not build, python2 not supported, moved to python3

baggins baggins at pld-linux.org
Mon Aug 11 01:54:51 CEST 2025 

commit bd2e4c2e0ffb2632b8e7d70188a422f9de2afe26
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Aug 11 03:54:09 2025 +0200

    - up to 2.14.0
    - java does not build, python2 not supported, moved to python3

 lttng-ust-python.patch | 11 -----------
 lttng-ust.spec         | 39 +++++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/lttng-ust.spec b/lttng-ust.spec
index ebe0239..8321b55 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -1,21 +1,20 @@
 #
 # Conditional build:
-%bcond_without	java		# JNI interface [builds with java-sun 1.6, but not gcj 4.9]
+%bcond_with	java		# JNI interface [builds with java-sun 1.6, but not gcj 4.9]
 %bcond_without	python		# Python agent
 %bcond_without	systemtap	# SystemTap integration
-%bcond_without	static_libs	# static libraries
+%bcond_with	static_libs	# static libraries
 #
 Summary:	LTTng Userspace Tracer
 Summary(pl.UTF-8):	LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
 Name:		lttng-ust
-Version:	2.13.9
+Version:	2.14.0
 Release:	1
 License:	LGPL v2.1 (library), MIT (headers), GPL v2 (programs)
 Group:		Libraries
 Source0:	https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
-# Source0-md5:	ab3bc006eb182bccd94aa0ead99c7201
+# Source0-md5:	d5bcaf37ebbf258d2de37326c8c2d4a1
 Patch0:		%{name}-link.patch
-Patch2:		%{name}-python.patch
 URL:		https://lttng.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.12
@@ -25,8 +24,8 @@ BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2
 BuildRequires:	numactl-devel
 BuildRequires:	pkgconfig
-%{?with_python:BuildRequires:	python >= 1:2.7}
-%{?with_python:BuildRequires:	python-modules >= 1:2.7}
+%{?with_python:BuildRequires:	python3}
+%{?with_python:BuildRequires:	python3-modules}
 BuildRequires:	rpmbuild(macros) >= 1.294
 BuildRequires:	sed >= 4.0
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
@@ -95,22 +94,21 @@ JNI interface for LTTng Userspace Tracer library.
 %description -n java-lttng-ust -l pl.UTF-8
 Interfejs JNI do biblioteki LTTng Userspace Tracer.
 
-%package -n python-lttng-ust
+%package -n python3-lttng-ust
 Summary:	Python agent for LTTng Userspace Tracer library
 Summary(pl.UTF-8):	Agent Pythona do biblioteki LTTng Userspace Tracer
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
 
-%description -n python-lttng-ust
+%description -n python3-lttng-ust
 Python agent for LTTng Userspace Tracer library.
 
-%description -n python-lttng-ust -l pl.UTF-8
+%description -n python3-lttng-ust -l pl.UTF-8
 Agent Pythona do biblioteki LTTng Userspace Tracer.
 
 %prep
 %setup -q
 %patch -P0 -p1
-%patch -P2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' tools/lttng-gen-tp
 
@@ -122,7 +120,7 @@ Agent Pythona do biblioteki LTTng Userspace Tracer.
 %{__automake}
 export CLASSPATH=.:%{_javadir}/log4j.jar
 %configure \
-	PYTHON=%{__python} \
+	PYTHON=%{__python3} \
 	%{?with_java:JAVA_HOME="%{java_home}" JAVAC=javac} \
 	--disable-silent-rules \
 	%{?with_java:--enable-jni-interface --enable-java-agent-all} \
@@ -144,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.md,python-agent.md}
 
 %if %{with java}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{context-jni,java,jul-jni,log4j-jni}.la \
@@ -165,8 +163,8 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n java-lttng-ust -p /sbin/ldconfig
 %postun	-n java-lttng-ust -p /sbin/ldconfig
 
-%post	-n python-lttng-ust -p /sbin/ldconfig
-%postun	-n python-lttng-ust -p /sbin/ldconfig
+%post	-n python3-lttng-ust -p /sbin/ldconfig
+%postun	-n python3-lttng-ust -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -176,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblttng-ust-common.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-common.so.1
 %attr(755,root,root) %{_libdir}/liblttng-ust-ctl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.5
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.6
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile.so.1
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so.*.*.*
@@ -253,7 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files -n java-lttng-ust
 %defattr(644,root,root,755)
-%doc doc/java-agent.txt
+%doc doc/java-agent.md
 %attr(755,root,root) %{_libdir}/liblttng-ust-context-jni.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-context-jni.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-context-jni.so
@@ -279,11 +277,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with python}
-%files -n python-lttng-ust
+%files -n python3-lttng-ust
 %defattr(644,root,root,755)
+%doc doc/python-agent.md
 %attr(755,root,root) %{_libdir}/liblttng-ust-python-agent.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-python-agent.so.1
 %attr(755,root,root) %{_libdir}/liblttng-ust-python-agent.so
-%{py_sitescriptdir}/lttngust
-%{py_sitescriptdir}/lttngust-%{version}-py*.egg-info
+%{py3_sitescriptdir}/lttngust
+%{py3_sitescriptdir}/lttngust-%{version}-py*.egg-info
 %endif
diff --git a/lttng-ust-python.patch b/lttng-ust-python.patch
deleted file mode 100644
index b9dd320..0000000
--- a/lttng-ust-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lttng-ust-2.13.1/src/python-lttngust/Makefile.am.orig	2021-12-09 20:45:58.000000000 +0100
-+++ lttng-ust-2.13.1/src/python-lttngust/Makefile.am	2022-02-05 10:58:51.238977525 +0100
-@@ -28,7 +28,7 @@ build-python-bindings.stamp: copy-static
- 	touch $@
- 
- install-exec-local: build-python-bindings.stamp
--	@opts="--prefix=$(prefix) --record $(INSTALLED_FILES) --verbose --no-compile $(DISTSETUPOPTS)"; \
-+	@opts="--prefix=$(prefix) --install-purelib=$(pythondir) --record $(INSTALLED_FILES) --verbose --no-compile $(DISTSETUPOPTS)"; \
- 	if [ "$(DESTDIR)" != "" ]; then \
- 		opts="$$opts --root=$(DESTDIR)"; \
- 	fi; \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-ust.git/commitdiff/bd2e4c2e0ffb2632b8e7d70188a422f9de2afe26

More information about the pld-cvs-commit mailing list