- updated to 1.2.0 (note: new sonames)

- added link patch
- package python binding

diff --git a/babeltrace-link.patch b/babeltrace-link.patch
new file mode 100644 (file)
index 0000000..0acef53
--- /dev/null
+++ b/babeltrace-link.patch
@@ -0,0 +1,19 @@
+--- babeltrace-1.2.0/formats/lttng-live/Makefile.am.orig       2014-02-28 19:11:47.000000000 +0100
++++ babeltrace-1.2.0/formats/lttng-live/Makefile.am    2014-03-03 07:30:40.911484235 +0100
+@@ -14,4 +14,5 @@
+       -Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
+ 
+ libbabeltrace_lttng_live_la_LIBADD = \
++      $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+       $(top_builddir)/lib/libbabeltrace.la
+--- babeltrace-1.2.0/bindings/python/Makefile.am.orig  2014-02-28 19:11:47.000000000 +0100
++++ babeltrace-1.2.0/bindings/python/Makefile.am       2014-03-03 07:54:53.981423256 +0100
+@@ -13,7 +13,7 @@
+ 
+ nodist__babeltrace_la_SOURCES = babeltrace_wrap.c
+ _babeltrace_la_SOURCES = python-complements.h python-complements.c
+-_babeltrace_la_LDFLAGS = -module
++_babeltrace_la_LDFLAGS = -module -avoid-version
+ 
+ _babeltrace_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
+ 

diff --git a/babeltrace.spec b/babeltrace.spec
index 1c60aa6ac17c4c608313d739fa5e2d20f31eebc6..d9f79d3af8cbc30ba57e5392d0e9f18e096d576f 100644 (file)
--- a/babeltrace.spec
+++ b/babeltrace.spec
@@ -1,17 +1,28 @@
+#
+# Conditional build:
+%bcond_without python  # Python binding
+#
 Summary:       Trace Format Babel Tower
 Summary(pl.UTF-8):     Wieża Babel formatów narzędzi śledzących
 Name:          babeltrace
-Version:       1.1.1
+Version:       1.2.0
 Release:       1
 License:       MIT
 Group:         Applications/System
 Source0:       http://lttng.org/files/babeltrace/%{name}-%{version}.tar.bz2
-# Source0-md5: 15cf79cb2407a75874e41c9e7658f987
+# Source0-md5: 104793ae3576ad9d1ef7d505f0ea5144
+Patch0:                %{name}-link.patch
 URL:           http://lttng.org/babeltrace
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
 BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: libtool >= 2:2
 BuildRequires: libuuid-devel
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
+%{?with_python:BuildRequires:  python-devel >= 2}
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.219
 Requires:      glib2 >= 1:2.22.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,11 +63,30 @@ Static Babeltrace libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki Babeltrace.
 
+%package -n python-babeltrace
+Summary:       Python binding to Babeltrace library
+Summary(pl.UTF-8):     Wiązanie Pythona do biblioteki Babeltrace
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python-babeltrace
+Python binding to Babeltrace library.
+
+%description -n python-babeltrace -l pl.UTF-8
+Wiązanie Pythona do biblioteki Babeltrace.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+       %{?with_python:--enable-python-bindings} \
        --disable-silent-rules
 %{__make}
 
@@ -66,11 +96,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# *.la kept - no .pc files for individual libraries
+# lib*.la kept - no .pc files for individual libraries
 
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/babeltrace
 
+%if %{with python}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_babeltrace.{la,a}
+%py_postclean
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,15 +118,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/babeltrace
 %attr(755,root,root) %{_bindir}/babeltrace-log
 %attr(755,root,root) %{_libdir}/libbabeltrace.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbabeltrace.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace.so.1
 %attr(755,root,root) %{_libdir}/libbabeltrace-ctf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf.so.1
 %attr(755,root,root) %{_libdir}/libbabeltrace-ctf-metadata.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf-metadata.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf-metadata.so.1
 %attr(755,root,root) %{_libdir}/libbabeltrace-ctf-text.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf-text.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-ctf-text.so.1
 %attr(755,root,root) %{_libdir}/libbabeltrace-dummy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-dummy.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-dummy.so.1
+%attr(755,root,root) %{_libdir}/libbabeltrace-lttng-live.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libbabeltrace-lttng-live.so.1
 %{_mandir}/man1/babeltrace.1*
 %{_mandir}/man1/babeltrace-log.1*
 
@@ -103,13 +140,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libbabeltrace-ctf-metadata.so
 %attr(755,root,root) %{_libdir}/libbabeltrace-ctf-text.so
 %attr(755,root,root) %{_libdir}/libbabeltrace-dummy.so
+%attr(755,root,root) %{_libdir}/libbabeltrace-lttng-live.so
 %{_libdir}/libbabeltrace.la
 %{_libdir}/libbabeltrace-ctf.la
 %{_libdir}/libbabeltrace-ctf-metadata.la
 %{_libdir}/libbabeltrace-ctf-text.la
 %{_libdir}/libbabeltrace-dummy.la
+%{_libdir}/libbabeltrace-lttng-live.la
 %{_includedir}/babeltrace
 %{_pkgconfigdir}/babeltrace.pc
+%{_pkgconfigdir}/babeltrace-ctf.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -118,3 +158,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libbabeltrace-ctf-metadata.a
 %{_libdir}/libbabeltrace-ctf-text.a
 %{_libdir}/libbabeltrace-dummy.a
+%{_libdir}/libbabeltrace-lttng-live.a
+
+%if %{with python}
+%files -n python-babeltrace
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/_babeltrace.so
+%{py_sitescriptdir}/babeltrace.py[co]
+%endif