From 6275c8d707229558487e2927f1f9940a9d237fbe Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 22 Jan 2009 15:40:44 -0600 Subject: [PATCH] 2009-01-22 David Smith * systemtap.spec: Added 'nss-devel' buildreq so that the 'client' subpackage could be built correctly. Added file-based buildreq for xmlto's pdf support, which works on f8, f9, f9, and rhel5. * configure.ac: Fixed typo. * configure: Regenerated. --- ChangeLog | 9 +++++++++ configure | 2 +- configure.ac | 2 +- systemtap.spec | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 688870868..117acd4e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-01-22 David Smith + + * systemtap.spec: Added 'nss-devel' buildreq so that the 'client' + subpackage could be built correctly. Added file-based buildreq + for xmlto's pdf support, which works on f8, f9, f9, and rhel5. + + * configure.ac: Fixed typo. + * configure: Regenerated. + 2009-01-22 Stan Cox * dtrace: Rewritten to handle dtrace -h -G diff --git a/configure b/configure index 3e57abe9f..f8af498a8 100755 --- a/configure +++ b/configure @@ -1444,7 +1444,7 @@ Optional Features: etc. found). --enable-refdocs enable building reference documentation (default on if xmlto etc. found and other documentation built). - --enble-server enable building of stap-server/client (default on if + --enable-server enable building of stap-server/client (default on if nss etc. found). Optional Packages: diff --git a/configure.ac b/configure.ac index fb9313193..7b9afb89b 100644 --- a/configure.ac +++ b/configure.ac @@ -216,7 +216,7 @@ AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], - AS_HELP_STRING([--enble-server], + AS_HELP_STRING([--enable-server], [enable building of stap-server/client (default on if nss etc. found).]), [enable_server=$enableval], [enable_server="check"]) diff --git a/systemtap.spec b/systemtap.spec index 75274d248..2586b85a2 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -30,6 +30,7 @@ Requires: kernel-devel Requires: gcc make # Suggest: kernel-debuginfo Requires: systemtap-runtime = %{version}-%{release} +BuildRequires: nss-devel %if %{with_bundled_elfutils} Source1: elfutils-%{elfutils_version}.tar.gz @@ -44,7 +45,10 @@ Requires: crash %if %{with_docs} BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html -BuildRequires: xmlto +# On F10, xmlto's pdf support was broken off into a sub-package, +# called 'xmlto-tex'. To avoid a specific F10 BuildReq, we'll do a +# file-based buildreq on '/usr/share/xmlto/format/fo/pdf'. +BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf %endif %description -- 2.43.5