X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lttng-ust.spec;h=c536a5de1542119e6d79d320d5e1021646be5570;hb=aa4fbb6f86483d6cbe7c9c97e1d778f4a8988002;hp=de1801c35037f511252ddc8e70b1c34ccf65b5e4;hpb=7f99f27eb5b056681bf79b20a1445936cef6c632;p=packages%2Flttng-ust.git

diff --git a/lttng-ust.spec b/lttng-ust.spec
index de1801c..c536a5d 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -3,26 +3,29 @@
 %bcond_without	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
 #
 Summary:	LTTng Userspace Tracer
 Summary(pl.UTF-8):	LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
 Name:		lttng-ust
-Version:	2.8.1
+Version:	2.10.3
 Release:	1
 License:	LGPL v2.1 (library), MIT (headers), GPL v2 (programs)
 Group:		Libraries
-Source0:	http://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
-# Source0-md5:	be505077245dc05f93370a565eec15f4
+Source0:	https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
+# Source0-md5:	ffcfa8c1ba9a52f002d240e936e9afa2
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-java.patch
 Patch2:		%{name}-python.patch
-URL:		http://lttng.org/ust
-BuildRequires:	autoconf >= 2.50
+URL:		https://lttng.org/
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	rpmbuild(macros) >= 1.294
+# for examples build
+BuildRequires:	cmake >= 2.8.11
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2
 %{?with_python:BuildRequires:	python >= 1:2.7}
+BuildRequires:	rpmbuild(macros) >= 1.294
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
 BuildRequires:	userspace-rcu-devel >= 0.7.2
 %if %{with java}
@@ -31,11 +34,11 @@ BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 %endif
 Requires:	userspace-rcu >= 0.7.2
-ExclusiveArch:	%{ix86} %{x8664} x32 arm aarch64 mips ppc ppc64 s390 s390x tile
+ExclusiveArch:	%{ix86} %{x8664} x32 %{arm} aarch64 mips ppc ppc64 s390 s390x tile
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # non-function rcu_reader_bp symbol
-%define		skip_post_check_so_1	liblttng-ust\.so.* liblttng-ust-cyg-profile\.so.* liblttng-ust-cyg-profile-fast\.so.* liblttng-ust-dl\.so.* liblttng-ust-tracepoint\.so.*
+%define		skip_post_check_so_1	liblttng-ust\.so.* liblttng-ust-cyg-profile\.so.* liblttng-ust-cyg-profile-fast\.so.* liblttng-ust-dl\.so.* liblttng-ust-java\.so.* liblttng-ust-python-agent\.so.* liblttng-ust-tracepoint\.so.*
 # non-function lttng_ust_context_info_tls symbol
 %define		skip_post_check_so_2	liblttng-ust-jul-jni\.so.* liblttng-ust-log4j-jni\.so.*
 
@@ -117,7 +120,8 @@ export CLASSPATH=.:%{_javadir}/log4j.jar
 	--disable-silent-rules \
 	%{?with_java:--enable-jni-interface --enable-java-agent-all} \
 	%{?with_python:--enable-python-agent} \
-	%{?with_systemtap:--with-sdt}
+	%{?with_systemtap:--with-sdt} \
+	%{?with_static_libs:--enable-static}
 
 %{__make} -j1
 
@@ -136,10 +140,12 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.txt}
 
 %if %{with java}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{context-jni,java,jul-jni,log4j-jni}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{context-jni,java,jul-jni,log4j-jni}.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{context-jni,java,jul-jni,log4j-jni}.a}
 %endif
 %if %{with python}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-python-agent.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-python-agent.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/liblttng-ust-python-agent.a}
 %py_postclean
 %endif
 
@@ -161,13 +167,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblttng-ust.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-ctl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.2
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.4
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile-fast.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-dl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-dl.so.0
+%attr(755,root,root) %{_libdir}/liblttng-ust-fd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fd.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-fork.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fork.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-libc-wrapper.so.*.*.*
@@ -185,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-dl.so
+%attr(755,root,root) %{_libdir}/liblttng-ust-fd.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-fork.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-libc-wrapper.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-pthread-wrapper.so
@@ -194,6 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblttng-ust-cyg-profile.la
 %{_libdir}/liblttng-ust-cyg-profile-fast.la
 %{_libdir}/liblttng-ust-dl.la
+%{_libdir}/liblttng-ust-fd.la
 %{_libdir}/liblttng-ust-fork.la
 %{_libdir}/liblttng-ust-libc-wrapper.la
 %{_libdir}/liblttng-ust-pthread-wrapper.la
@@ -211,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tracepoint_enabled.3*
 %{_examplesdir}/%{name}-%{version}
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/liblttng-ust.a
@@ -218,10 +229,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblttng-ust-cyg-profile.a
 %{_libdir}/liblttng-ust-cyg-profile-fast.a
 %{_libdir}/liblttng-ust-dl.a
+%{_libdir}/liblttng-ust-fd.a
 %{_libdir}/liblttng-ust-fork.a
 %{_libdir}/liblttng-ust-libc-wrapper.a
 %{_libdir}/liblttng-ust-pthread-wrapper.a
 %{_libdir}/liblttng-ust-tracepoint.a
+%endif
 
 %if %{with java}
 %files -n java-lttng-ust