Author: arekm Date: Sun Jul 1 12:26:14 2012 GMT Module: packages Tag: HEAD ---- Log message: - partial 1.8 update
---- Files affected: packages/systemtap: systemtap.spec (1.17 -> 1.18) , systemtap-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/systemtap/systemtap.spec diff -u packages/systemtap/systemtap.spec:1.17 packages/systemtap/systemtap.spec:1.18 --- packages/systemtap/systemtap.spec:1.17 Fri Jan 27 11:22:14 2012 +++ packages/systemtap/systemtap.spec Sun Jul 1 14:26:09 2012 @@ -4,22 +4,29 @@ # - BRs # - more configure options # +%bcond_with doc Summary: Instrumentation System Summary(pl.UTF-8): System oprzyrządowania Name: systemtap -Version: 1.6 -Release: 1 +Version: 1.8 +Release: 0.1 License: GPL v2+ Group: Base Source0: http://sources.redhat.com/systemtap/ftp/releases/%{name}-%{version}.tar.gz -# Source0-md5: b845ec58bc04cf4cad5c897f67de1308 +# Source0-md5: 5b7ab0ae0efc520f0b19f9dbf11977c9 Patch0: %{name}-configure.patch +Patch1: %{name}-build.patch URL: http://sourceware.org/systemtap/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: xmlto +BuildRequires: avahi-devel BuildRequires: elfutils-devel BuildRequires: glib2-devel BuildRequires: mysql-devel +BuildRequires: nss-devel +BuildRequires: sqlite3-devel +BuildRequires: texlive-latex BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -32,9 +39,104 @@ 2.6. Programiści mogą pisać narzędzia do zbierania danych dotyczących operacji w systemie. +%package server +Summary: Instrumentation System Server +License: GPL v2+ +Group: Applications/System +URL: http://sourceware.org/systemtap/ +Requires: /bin/mktemp +Requires: systemtap-devel = %{version}-%{release} +Requires: unzip +Requires: zip +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig + +%description server +This is the remote script compilation server component of systemtap. +It announces itself to nearby clients with avahi (if available), and +compiles systemtap scripts to kernel objects on their demand. + + +%package devel +Summary: Programmable system-wide instrumentation system - development headers, tools +License: GPL v2+ +Group: Development/Libraries +URL: http://sourceware.org/systemtap/ +Requires: gcc +Requires: linux-libc-headers +Requires: make + +%description devel +This package contains the components needed to compile a systemtap +script from source form into executable (.ko) forms. It may be +installed on a self-contained developer workstation (along with the +systemtap-client and systemtap-runtime packages), or on a dedicated +remote server (alongside the systemtap-server package). It includes a +copy of the standard tapset library and the runtime library C files. + +%package runtime +Summary: Programmable system-wide instrumentation system - runtime +License: GPL v2+ +Group: Base +URL: http://sourceware.org/systemtap/ + +%description runtime +SystemTap runtime contains the components needed to execute a +systemtap script that was already compiled into a module using a local +or remote systemtap-devel installation. + +%package client +Summary: Programmable system-wide instrumentation system - client +License: GPL v2+ +Group: Base +URL: http://sourceware.org/systemtap/ +Requires: coreutils +Requires: grep +Requires: openssh-clients +Requires: sed +Requires: systemtap-runtime = %{version}-%{release} +Requires: unzip +Requires: zip + +%description client +This package contains/requires the components needed to develop +systemtap scripts, and compile them using a local systemtap-devel or a +remote systemtap-server installation, then run them using a local or +remote systemtap-runtime. It includes script samples and +documentation, and a copy of the tapset library for reference. + + +%package initscript +Summary: Systemtap Initscripts +License: GPL v2+ +Group: Base +URL: http://sourceware.org/systemtap/ +Requires: systemtap = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): rc-scripts +Requires(postun): rc-scripts + +%description initscript +Sysvinit scripts to launch selected systemtap scripts at system +startup. + +%package sdt-devel +Summary: Static probe support tools +License: GPLv2+ and Public Domain +Group: Development/Libraries +URL: http://sourceware.org/systemtap/ + +%description sdt-devel +This package includes the <sys/sdt.h> header file used for static +instrumentation compiled into userspace programs and libraries, along +with the optional dtrace-compatibility preprocessor to process related +.d files into tracing-macro-laden .h headers. + %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__aclocal} @@ -42,7 +144,11 @@ %{__autoheader} %{__automake} %configure \ - --disable-silent-rules + --disable-silent-rules \ + --enable-pie \ + --enable-sqlite \ + --%{?with_doc:en}%{!?with_doc:dis}able-docs \ + --enable-server %{__make} %install @@ -53,6 +159,8 @@ install -d $RPM_BUILD_ROOT/var/cache/%{name} +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -65,14 +173,20 @@ %attr(755,root,root) %{_bindir}/stap-report %attr(755,root,root) %{_bindir}/stapgraph %attr(755,root,root) %{_bindir}/staprun -%attr(755,root,root) %{_bindir}/dtrace %{_datadir}/%{name} %{_libexecdir}/%{name} %dir /var/cache/%{name} -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* -%{_mandir}/man7/*.7* -%{_mandir}/man8/*.8* +#%{_mandir}/man1/*.1* +#%{_mandir}/man3/*.3* +#%{_mandir}/man7/*.7* +#%{_mandir}/man8/*.8* + +%files sdt-devel -f %{name}.lang +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/dtrace +%{_includedir}/sys/sdt.h +%{_includedir}/sys/sdt-config.h +%{_mandir}/man1/dtrace.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -80,6 +194,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2012/07/01 12:26:09 arekm +- partial 1.8 update + Revision 1.17 2012/01/27 10:22:14 zbyniu - up to 1.6 ================================================================ Index: packages/systemtap/systemtap-build.patch diff -u /dev/null packages/systemtap/systemtap-build.patch:1.1 --- /dev/null Sun Jul 1 14:26:14 2012 +++ packages/systemtap/systemtap-build.patch Sun Jul 1 14:26:09 2012 @@ -0,0 +1,11 @@ +--- systemtap-1.8/Makefile.am~ 2012-06-17 18:27:54.000000000 +0200 ++++ systemtap-1.8/Makefile.am 2012-07-01 14:12:11.969612715 +0200 +@@ -183,7 +183,7 @@ + stap_serverd_SOURCES = stap-serverd.cxx cscommon.cxx util.cxx privilege.cxx nsscommon.cxx cmdline.cxx + stap_serverd_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS) + stap_serverd_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ $(nss_CFLAGS) +-stap_serverd_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ ++stap_serverd_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ -pthread + stap_serverd_LDADD = $(nss_LIBS) + if HAVE_AVAHI + stap_serverd_CFLAGS += $(avahi_CFLAGS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/systemtap/systemtap.spec?r1=1.17&r2=1.18 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
