- partial 1.8 update

Changed files:
    systemtap-build.patch -> 1.1
    systemtap.spec -> 1.18

diff --git a/systemtap-build.patch b/systemtap-build.patch
new file mode 100644 (file)
index 0000000..b2f413a
--- /dev/null
+++ b/systemtap-build.patch
@@ -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)

diff --git a/systemtap.spec b/systemtap.spec
index 1ec6c210ce394e3b2bec9c92af414dd25e0b3a6d..17d42637f022739e20476bdf23a86a455c590c7f 100644 (file)
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -3,22 +3,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
@@ -31,9 +38,104 @@ SystemTap to system oprzyrządowania dla systemów opartych na Linuksie
 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}
@@ -41,7 +143,11 @@ operacji w systemie.
 %{__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
@@ -52,6 +158,8 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/var/cache/%{name}
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,11 +172,17 @@ rm -rf $RPM_BUILD_ROOT
 %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*