- updated to 2.6.0

- updated link patch
- added java patch (make .class files before using javah)

diff --git a/lttng-ust-java.patch b/lttng-ust-java.patch
new file mode 100644 (file)
index 0000000..671b775
--- /dev/null
+++ b/lttng-ust-java.patch
@@ -0,0 +1,11 @@
+--- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-27 16:26:04.867994970 +0100
++++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am      2015-01-27 17:05:53.134561412 +0100
+@@ -19,7 +19,7 @@
+ 
+ org_lttng_ust_LTTngUst.h: jni-header.stamp
+ 
+-jni-header.stamp: $(dist_noinst_JAVA)
++jni-header.stamp: classnoinst.stamp
+       $(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+       echo "JNI header generated" > jni-header.stamp
+ 

diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index 44e502eeb95e5a41002e63fd81ba3033b05b6719..6ae97a2b2fc9d5b029ff68d6b4ea38317041e217 100644 (file)
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -1,14 +1,3 @@
---- lttng-ust-2.4.0/liblttng-ust-java/Makefile.am.orig 2014-03-03 08:55:13.364604698 +0100
-+++ lttng-ust-2.4.0/liblttng-ust-java/Makefile.am      2014-03-03 08:57:12.334599705 +0100
-@@ -9,7 +9,7 @@
- liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
- nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
- dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
--liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_java_la_LIBADD = $(top_builddir)/liblttng-ust/liblttng-ust.la -ldl
- 
- if HAVE_JAVA_JDK
- JCC=$(JAVA_JDK)/bin
 --- lttng-ust-2.4.0/liblttng-ust/Makefile.am.orig      2014-02-28 19:20:10.000000000 +0100
 +++ lttng-ust-2.4.0/liblttng-ust/Makefile.am   2014-03-03 10:55:00.270969760 +0100
 @@ -67,6 +67,7 @@
@@ -19,14 +8,30 @@
        -lpthread \
        -lrt \
        -lurcu-cds \
---- lttng-ust-2.4.0/liblttng-ust-jul/Makefile.am.orig  2014-02-28 19:20:10.000000000 +0100
-+++ lttng-ust-2.4.0/liblttng-ust-jul/Makefile.am       2014-03-03 10:55:41.377634701 +0100
-@@ -15,7 +15,7 @@
-       $(LTTNG_JUL_SRCDIR)/LTTngSessiondCmd2_4.java \
-       $(LTTNG_JUL_SRCDIR)/LTTngTCPSessiondClient.java \
-       $(LTTNG_JUL_SRCDIR)/LTTngThread.java
+--- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-26 21:09:30.334240517 +0100
++++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am      2015-01-26 21:11:19.994235912 +0100
+@@ -12,7 +12,7 @@
+ liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
+ nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
+ 
+-liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
++liblttng_ust_java_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
+ 
+ $(jarfile): classnoinst.stamp
+       $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
+--- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am.orig   2015-01-26 20:39:58.000000000 +0100
++++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am        2015-01-26 21:17:08.297554669 +0100
+@@ -6,4 +6,4 @@
+ 
+ nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LTTngLogHandler.h
+ 
 -liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_jul_jni_la_LIBADD = $(top_builddir)/liblttng-ust/liblttng-ust.la -ldl
++liblttng_ust_jul_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
+--- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig 2015-01-26 20:39:58.000000000 +0100
++++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am      2015-01-26 21:17:37.837553389 +0100
+@@ -5,4 +5,4 @@
  
- lttnglibjava_DATA = liblttng-ust-jul.jar
+ nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LTTngLogAppender.h
  
+-liblttng_ust_log4j_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
++liblttng_ust_log4j_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la

diff --git a/lttng-ust.spec b/lttng-ust.spec
index f091544f989d65e4e4deb0ac111cee98237e0e29..eb05d90b36b6ab2623274189d5ca255de57f6f61 100644 (file)
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -6,21 +6,26 @@
 Summary:       LTTng Userspace Tracer
 Summary(pl.UTF-8):     LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
 Name:          lttng-ust
-Version:       2.5.1
+Version:       2.6.0
 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: d551d601bdc1a9285e1cd6c5728fb803
+# Source0-md5: 74ad4826eac76c9dbf50fd3e46523191
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-java.patch
 URL:           http://lttng.org/ust
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-%{?with_java:BuildRequires:    jdk}
 BuildRequires: rpmbuild(macros) >= 1.294
 BuildRequires: libtool >= 2:2
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: userspace-rcu-devel >= 0.7.2
+%if %{with java}
+BuildRequires: java-log4j
+BuildRequires: jdk
+BuildRequires: jpackage-utils
+%endif
 Requires:      userspace-rcu >= 0.7.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,6 +80,7 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -82,10 +88,11 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export CLASSPATH=.
+export CLASSPATH=.:%{_javadir}/log4j.jar
 %configure \
+       %{?with_java:JAVAC="%{javac}"} \
        --disable-silent-rules \
-       %{?with_java:--with-java-jdk=%{java_home} --with-jni-interface} \
+       %{?with_java:--enable-jni-interface --enable-java-agent-all} \
        %{?with_systemtap:--with-sdt}
 
 %{__make}
@@ -102,12 +109,10 @@ 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,java-util-logging.txt}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.txt}
 
 %if %{with java}
-install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p liblttng-ust-java/liblttng-ust-java.jar $RPM_BUILD_ROOT%{_javadir}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni,log4j-jni}.{la,a}
 %endif
 
 %clean
@@ -121,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
 %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.*.*.*
@@ -185,13 +190,18 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files -n java-lttng-ust
 %defattr(644,root,root,755)
-%doc doc/java-util-logging.txt
+%doc doc/java-agent.txt
 %attr(755,root,root) %{_libdir}/liblttng-ust-java.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-java.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-java.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-jul-jni.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so
+%attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-log4j-jni.so.0
+%attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so
+%{_javadir}/liblttng-ust-agent-1.0.0.jar
+%{_javadir}/liblttng-ust-agent.jar
 %{_javadir}/liblttng-ust-java.jar
 %{_javadir}/liblttng-ust-jul.jar
 %endif