From 52ac4b9364580ec5ceb6cb8de7709b63a9e6a379def024b4d90b8554338719e3 Mon Sep 17 00:00:00 2001
From: Tony Jones <tonyj@suse.com>
Date: Fri, 6 Oct 2017 17:14:01 +0000
Subject: [PATCH] Accepting request 532278 from
 home:jones_tony:branches:devel:tools:lttng

- Fix typo in package summary
- Update to version 3.10 for SLE15 (bsc#1055683)
- Adhere to shared library policy (new lib: liblttng-ctl$sover)
- Do not package static libraries

OBS-URL: https://build.opensuse.org/request/show/532278
OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-tools?expand=0&rev=15
---
 lttng-tools-2.10.1.tar.bz2 |  3 +++
 lttng-tools-2.7.1.tar.bz2  |  3 ---
 lttng-tools.changes        | 12 ++++++++++++
 lttng-tools.spec           | 37 +++++++++++++++++++++++--------------
 4 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 lttng-tools-2.10.1.tar.bz2
 delete mode 100644 lttng-tools-2.7.1.tar.bz2

diff --git a/lttng-tools-2.10.1.tar.bz2 b/lttng-tools-2.10.1.tar.bz2
new file mode 100644
index 0000000..4064afb
--- /dev/null
+++ b/lttng-tools-2.10.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20bc4b7ad297c0181f20f8cf3ba2967ded76d5628a05b8c7817d39a928edaa00
+size 1238531
diff --git a/lttng-tools-2.7.1.tar.bz2 b/lttng-tools-2.7.1.tar.bz2
deleted file mode 100644
index a775046..0000000
--- a/lttng-tools-2.7.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c799fb21dfa42475feaa1507ded934608b2e531039b46c40e944a5b81c7b21c
-size 984351
diff --git a/lttng-tools.changes b/lttng-tools.changes
index eb4f760..40add39 100644
--- a/lttng-tools.changes
+++ b/lttng-tools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Oct  6 16:00:21 UTC 2017 - tonyj@suse.com
+
+- Fix typo in package summary
+
+-------------------------------------------------------------------
+Thu Aug 31 20:41:08 UTC 2017 - tonyj@suse.com
+
+- Update to version 3.10 for SLE15 (bsc#1055683)
+- Adhere to shared library policy (new lib: liblttng-ctl$sover)
+- Do not package static libraries
+
 -------------------------------------------------------------------
 Tue Aug  2 16:32:36 UTC 2016 - normand@linux.vnet.ibm.com
 
diff --git a/lttng-tools.spec b/lttng-tools.spec
index c98967a..a01a51d 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lttng-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,12 @@
 #
 
 
-%define         majorversion 2.7.0
+%define         majorversion 2.10.0
+%define         ctllib_sover 0
+%define         ctllib liblttng-ctl%{ctllib_sover}
 
 Name:           lttng-tools
-Version:        2.7.1
+Version:        2.10.1
 Release:        0
 Source:         http://lttng.org/files/%{name}/%{name}-%{version}.tar.bz2
 Summary:        Linux Trace Toolkit Next Generation 2.0 userspace tools
@@ -41,11 +43,18 @@ Recommends:     lttng-modules-kmp
 This package provides the userspace tools for controlling the LTTng subsystem
 from userspace.
 
+%package -n %{ctllib}
+Summary:        Linux Trace Toolkit Next Generation 2.0 control and utility library
+Group:          System/Libraries
+
+%description -n %{ctllib}
+This package provides a userspace library for controlling the LTTng subsystem. It is primarily intended for use by the lttng-tools package.
+
 %package -n %{name}-devel
 
 Summary:        Linux Trace Toolkit Next Generation 2.0 userspace tools
 Group:          Development/Languages/C and C++
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{ctllib} >= %{majorversion}
 
 %description -n %{name}-devel
 This package provides the userspace tools for controlling the LTTng subsystem
@@ -60,14 +69,14 @@ make
 
 %install
 make DESTDIR=%buildroot install
-rm -vf %buildroot%{_libdir}/*.la
+rm -f %buildroot%{_libdir}/*.la
+rm -f %buildroot%{_libdir}/*.a
 
 %clean
 rm -rf %buildroot
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post -n %{ctllib} -p /sbin/ldconfig
+%postun -n %{ctllib} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -78,11 +87,9 @@ rm -rf %buildroot
 %{_bindir}/lttng-relayd
 %{_libdir}/lttng/libexec/lttng-consumerd
 %{_bindir}/lttng-sessiond
-%{_libdir}/*.so.*
-%{_mandir}/man1/lttng.1.gz
-%{_mandir}/man1/lttng-crash.1.gz
-%{_mandir}/man8/lttng-sessiond.8.gz
-%{_mandir}/man8/lttng-relayd.8.gz
+%{_mandir}/man1/*.1.gz
+%{_mandir}/man3/*.3.gz
+%{_mandir}/man8/*.8.gz
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/ChangeLog
 %{_docdir}/%{name}/LICENSE
@@ -91,11 +98,13 @@ rm -rf %buildroot
 %dir %{_prefix}/share/xml/lttng
 %{_prefix}/share/xml/lttng/session.xsd
 
+%files -n %{ctllib}
+%{_libdir}/*.so.*
+
 %files -n %{name}-devel
 %defattr(-,root,root)
 %{_prefix}/include/lttng/*
 %{_libdir}/*.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/lttng-ctl.pc
 
 %changelog