Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2011-11-10 16:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemtap", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap-docs.changes 2011-09-23 12:47:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap-docs.changes 2011-11-10 16:05:34.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 2 10:54:46 CET 2011 - [email protected] + +- update to 1.6 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2011-09-23 12:47:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2011-11-10 16:05:34.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 2 10:54:26 CET 2011 - [email protected] + +- update to 1.6 + changes 1.5-1.6: http://sourceware.org/ml/systemtap/2011-q3/msg00105.html + changes 1.4-1.5: http://sourceware.org/ml/systemtap/2011-q2/msg00218.html + +------------------------------------------------------------------- +Fri Aug 19 08:38:29 UTC 2011 - [email protected] + +- Fix for bnc#710291 - systemtap: fails rpmlint check non-ghost-in-var-run + +------------------------------------------------------------------- Old: ---- 0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch systemtap-1.4-gcc46.patch systemtap-1.4.tar.bz2 New: ---- 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch stap-server.conf systemtap-1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.4IielJ/_old 2011-11-10 16:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.4IielJ/_new 2011-11-10 16:05:36.000000000 +0100 @@ -24,29 +24,22 @@ BuildRequires: xmlto BuildRequires: fop BuildRequires: latex2html -%define use_snapshot 0 License: GPLv2+ -Version: 1.4 +Version: 1.6 Release: 5 Summary: Documents and examples for systemtap Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ -%if %use_snapshot -%define package_version 20090214 -%else -%define package_version %{version} -%endif -Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2 +Source: systemtap-%{version}.tar.bz2 Source2: README-BEFORE-ADDING-PATCHES Patch1: systemtap-docdir-fix.diff Patch2: systemtap-xmlto-fop.diff -# PATCH-FIX-UPSTREAM systemtap-1.4-gcc46.patch [email protected] -- Fix compilation with gcc 4.6 -Patch3: systemtap-1.4-gcc46.patch +Patch3: 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -SystemTap is an instrumentation system for systems running Linux 2.6. +SystemTap is an instrumentation system for systems running Linux. This package contains the documents and examples for systemtap. @@ -59,11 +52,7 @@ Tom Zanussi <[email protected]> %prep -%if %use_snapshot -%setup -n src -q -%else -%setup -n systemtap-%{package_version} -q -%endif +%setup -n systemtap-%{version} -q %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -73,7 +62,7 @@ find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, /usr/bin/env,' find testsuite examples -type f | xargs chmod 644 autoreconf -fi -%configure +%configure --docdir=%{_docdir}/systemtap --disable-nls make %{?jobs:-j %jobs} %install ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.4IielJ/_old 2011-11-10 16:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.4IielJ/_new 2011-11-10 16:05:36.000000000 +0100 @@ -21,34 +21,21 @@ Name: systemtap BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel BuildRequires: mozilla-nspr-devel mozilla-nss-devel mozilla-nss-tools -%define use_snapshot 0 License: GPLv2+ -Version: 1.4 +Version: 1.6 Release: 8 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ -# Requires: kernel-source gcc make -# Suggest: kernel-smp-debuginfo -%if %use_snapshot -%define package_version 20090214 -%else -%define package_version %{version} -%endif -Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2 -# need -docdir patch even though docs are packaged by systemtap-docs.spec -# so that they are installed into directories matching below rm -rf's -Patch1: systemtap-docdir-fix.diff -Patch2: 0001-adding-ifdef-CLONE_STOPPED-to-stop-module-compilati.patch -# PATCH-FIX-UPSTREAM systemtap-1.4-gcc46.patch [email protected] -- Fix compilation with gcc 4.6 -Patch3: systemtap-1.4-gcc46.patch - -Requires: libebl1 +Source: systemtap-%{version}.tar.bz2 +Source2: README-BEFORE-ADDING-PATCHES +Source3: stap-server.conf +Obsoletes: systemtap-client < 1.5 Requires: %{name}-runtime = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -SystemTap is an instrumentation system for systems running Linux 2.6. +SystemTap is an instrumentation system for systems running Linux. Developers can write instrumentation to collect data on the operation of the system. @@ -58,21 +45,9 @@ Summary: Runtime environment for systemtap %description runtime -SystemTap is an instrumentation system for systems running Linux 2.6. +SystemTap is an instrumentation system for systems running Linux. This package contains the runtime environment for systemtap programs. -%package client -License: GPLv2+ -Group: Development/Tools/Debuggers -Summary: Systemtap client -Requires: %{name}-runtime = %{version}-%{release} -# dependancies for systemtap shell scripts -Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip - -%description client -SystemTap is an instrumentation system for systems running Linux 2.6. -This package contains the client component for systemtap. - %package server License: GPLv2+ Group: Development/Tools/Debuggers @@ -82,7 +57,7 @@ Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip %description server -SystemTap is an instrumentation system for systems running Linux 2.6. +SystemTap is an instrumentation system for systems running Linux. This package contains the server component of systemtap. %package sdt-devel @@ -93,22 +68,14 @@ Requires: python-base %description sdt-devel -SystemTap is an instrumentation system for systems running Linux 2.6. +SystemTap is an instrumentation system for systems running Linux. This package contains the support tools for static probes. %prep -%if %use_snapshot -%setup -n src -q -%else -%setup -n %{name}-%{package_version} -q -%endif -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%setup -q %build -autoreconf -fi -%configure +%configure --disable-docs --docdir=%{_docdir}/systemtap make %{?jobs:-j %jobs} %install @@ -122,9 +89,13 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/systemtap/ cp COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server.log +# config file for stap-server (/var/run now on tmpfs) +mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d +install -m 644 %SOURCE3 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d + +%{find_lang} systemtap %clean rm -rf ${RPM_BUILD_ROOT} @@ -133,53 +104,38 @@ %defattr(-,root,root) %{_bindir}/stap %{_mandir}/man[17]/* - %dir %{_datadir}/%{name} %{_datadir}/%{name}/runtime %{_datadir}/%{name}/tapset #packaged by systemtap-initscript in upstream %dir %{_localstatedir}/cache/systemtap -%dir %{_localstatedir}/run/systemtap -%files runtime +%files runtime -f systemtap.lang %defattr(-,root,root) %doc %{_docdir}/systemtap %{_bindir}/staprun +%{_bindir}/stapsh %{_bindir}/stap-merge %{_bindir}/stap-report -%{_bindir}/stap-authorize-signing-cert %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/stapio %{_libexecdir}/%{name}/stap-env %{_libexecdir}/%{name}/stap-authorize-cert %{_mandir}/man8/staprun.8* -%{_mandir}/man8/stap-authorize-signing-cert.8* - -%files client -%defattr(-,root,root) -%defattr(-,root,root) -%{_bindir}/stap-client -%{_bindir}/stap-authorize-server-cert -%{_libexecdir}/%{name}/stap-find-servers -%{_libexecdir}/%{name}/stap-client-connect -%{_mandir}/man8/stap-client.8* -%{_mandir}/man8/stap-authorize-server-cert.8* %files server %defattr(-,root,root) -%{_bindir}/stap-authorize-server-cert +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/stap-server.conf %{_bindir}/stap-server +%{_libexecdir}/%{name}/stap-gen-cert %{_libexecdir}/%{name}/stap-serverd +%{_libexecdir}/%{name}/stap-sign-module %{_libexecdir}/%{name}/stap-start-server -%{_libexecdir}/%{name}/stap-find-servers -%{_libexecdir}/%{name}/stap-find-or-start-server %{_libexecdir}/%{name}/stap-stop-server -%{_libexecdir}/%{name}/stap-gen-cert -%{_libexecdir}/%{name}/stap-server-connect -%{_libexecdir}/%{name}/stap-sign-module %{_mandir}/man8/stap-server.8* -%{_mandir}/man8/stap-authorize-server-cert.8* %ghost %{_localstatedir}/log/stap-server.log +%ghost %dir %{_localstatedir}/run/stap-server %files sdt-devel %defattr(-,root,root) ++++++ 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch ++++++ >From e281908fcbcb10a848e109d23c3ca4f2d2ef0a40 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" <[email protected]> Date: Thu, 22 Sep 2011 11:53:13 -0400 Subject: PR13216: set AM_GNU_GETTEXT_VERSION(0.17) in configury Git-commit: e281908fcbcb10a848e109d23c3ca4f2d2ef0a40 Patch-mainline: yes Signed-off-by: Jiri Slaby <[email protected]> --- configure.ac | 2 +- testsuite/aclocal.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ce3121e..c8b90de 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_PROG_MAKE_SET AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AM_GNU_GETTEXT(external) -AM_GNU_GETTEXT_VERSION +AM_GNU_GETTEXT_VERSION(0.15) AC_CHECK_FUNCS(ppoll) dnl Handle the prologues option. ++++++ stap-server.conf ++++++ # Systemtap-server needs some files in /var/run d /var/run/stap-server 0755 root root - ++++++ systemtap-1.4.tar.bz2 -> systemtap-1.6.tar.bz2 ++++++ ++++ 78737 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
