- merged 2.7 from PLD, doc still broken

[packages/systemtap.git] / systemtap.spec

diff --git a/systemtap.spec b/systemtap.spec
index 5f08c11331269a3d8d67263c068d3946ce46cf7b..0fbef986b1ab9bed40b57b962cb9d9d3d33ad976 100644 (file)
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -5,7 +5,7 @@
 %bcond_without crash           # crash extension
 %bcond_without dyninst         # dyninst support
 %bcond_without java            # Java runtime support
-#
+
 %ifnarch %{ix86} %{x8664} alpha arm ia64 ppc64 s390 s390x
 %undefine      with_crash
 %endif
@@ -15,16 +15,15 @@
 Summary:       Instrumentation System
 Summary(pl.UTF-8):     System oprzyrządowania
 Name:          systemtap
-Version:       2.6
-Release:       3
+Version:       2.7
+Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 65e6745f0ec103758c711dd1d12fb6bf
+# Source0-md5: e0c3c36955323ae59be07a26a9563474
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-build.patch
 Patch2:                %{name}-rpm5-support.patch
-Patch3:                %{name}-dtrace-flexibility.patch
 Patch4:                format-security.patch
 URL:           http://sourceware.org/systemtap/
 BuildRequires: autoconf >= 2.63
@@ -35,9 +34,13 @@ BuildRequires:       boost-devel
 BuildRequires: docbook-dtd412-xml
 %{?with_dyninst:BuildRequires: dyninst-devel >= 8.0}
 BuildRequires: elfutils-devel >= 0.148
+BuildRequires: gettext-devel >= 0.18.2
 BuildRequires: gettext-tools >= 0.18.2
 BuildRequires: glib2-devel
-%{?with_java:BuildRequires:    jdk}
+%if %{with java}
+BuildRequires: jdk
+BuildRequires: rpm-javaprov
+%endif
 %if %{with dyninst} || %{with java}
 BuildRequires: libselinux-devel
 %endif
@@ -46,7 +49,9 @@ BuildRequires:        libvirt-devel >= 1.0.2
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: mysql-devel
 BuildRequires: nss-devel >= 3
+BuildRequires: pkgconfig
 BuildRequires: rpm-devel
+BuildRequires: rpm-pythonprov
 BuildRequires: sqlite3-devel >= 3
 BuildRequires: xmlto
 %if %{with doc}
@@ -56,6 +61,8 @@ BuildRequires:        texlive-dvips
 BuildRequires: texlive-fonts-bitstream
 BuildRequires: texlive-fonts-type1-bitstream
 BuildRequires: texlive-latex
+BuildRequires: texlive-latex-psnfss
+BuildRequires: texlive-xetex
 %endif
 # let base mean client+local development package
 Requires:      %{name}-client = %{version}-%{release}
@@ -216,11 +223,21 @@ przestrzeni użytkownika, wraz z opcjonalnym preprocesorem zgodności z
 dtrace, który przetwarza pliki .d na pliki nagłówkowe .h z makrami
 śledzącymi.
 
+%package doc
+Summary:       SystemTap guides and tutorials
+Summary(pl.UTF-8):     Przewodniki i dokumentacja wprowadzająca do SystemTap
+Group:         Documentation
+
+%description doc
+SystemTap guides and tutorials.
+
+%description doc -l pl.UTF-8
+Przewodniki i dokumentacja wprowadzająca do SystemTap.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
 %patch4 -p1
 %if "%{_rpmversion}" >= "5.0"
 %patch2 -p1
@@ -254,19 +271,24 @@ install -d $RPM_BUILD_ROOT/var/{cache,run}/%{name} \
        DESTDIR=$RPM_BUILD_ROOT
 
 # not installed by make
-install stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep
+install -p stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep
 
-install initscript/systemtap $RPM_BUILD_ROOT/etc/rc.d/init.d
-install initscript/config.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/config
+install -p initscript/systemtap $RPM_BUILD_ROOT/etc/rc.d/init.d
+cp -p initscript/config.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/config
 
-install initscript/stap-server $RPM_BUILD_ROOT/etc/rc.d/init.d
-install initscript/config.stap-server $RPM_BUILD_ROOT/etc/sysconfig/stap-server
-install initscript/logrotate.stap-server $RPM_BUILD_ROOT/etc/logrotate.d/stap-server
+install -p initscript/stap-server $RPM_BUILD_ROOT/etc/rc.d/init.d
+cp -p initscript/config.stap-server $RPM_BUILD_ROOT/etc/sysconfig/stap-server
+cp -p initscript/logrotate.stap-server $RPM_BUILD_ROOT/etc/logrotate.d/stap-server
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/{conf.d,script.d}
 install -d $RPM_BUILD_ROOT/var/lib/stap-server/.systemtap
 install -d $RPM_BUILD_ROOT/var/log/stap-server
 
+%if %{with doc}
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+mv $RPM_BUILD_ROOT{%{_docdir}/%{name}/examples,%{_examplesdir}/%{name}-client-%{version}}
+%endif
+
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/systemtap docs-installed
 
 %find_lang %{name}
@@ -292,13 +314,15 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_crash:%attr(755,root,root) %{_libdir}/%{name}/staplog.so}
 %{_mandir}/man1/stap-merge.1*
 %{_mandir}/man1/stap-report.1*
-#%{_mandir}/man3/function::*.3stap*
-#%{_mandir}/man3/probe::*.3stap*
 %{_mandir}/man3/stapex.3stap*
 %{_mandir}/man3/stapfuncs.3stap*
 %{_mandir}/man3/stapprobes.3stap*
 %{_mandir}/man3/stapvars.3stap*
-#%{_mandir}/man3/tapset::*.3stap*
+%if %{with doc}
+%{_mandir}/man3/function::*.3stap*
+%{_mandir}/man3/probe::*.3stap*
+%{_mandir}/man3/tapset::*.3stap*
+%endif
 %{_mandir}/man7/error::*.7stap*
 %{_mandir}/man7/stappaths.7*
 %{_mandir}/man7/warning::debuginfo.7stap*
@@ -318,7 +342,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files client
 %defattr(644,root,root,755)
-%doc docs-installed/examples %{?with_docs:docs-installed/{tapsets,langref.pdf,tutorial.pdf}}
+%if %{with doc}
+%doc docs-installed/{tapsets,langref.pdf,tutorial.pdf}
+%{_examplesdir}/%{name}-client-%{version}
+%endif
 %attr(755,root,root) %{_bindir}/stap
 %attr(755,root,root) %{_bindir}/stap-prep
 %attr(755,root,root) %{_bindir}/stapvirt
@@ -369,3 +396,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/sys/sdt.h
 %{_includedir}/sys/sdt-config.h
 %{_mandir}/man1/dtrace.1*
+
+%if %{with publican}
+%files doc
+%defattr(644,root,root,755)
+%doc doc/{langref,tutorial}.pdf doc/beginners/SystemTap_Beginners_Guide.pdf
+%endif