diff options
| author | Mark Wielaard <mjw@redhat.com> | 2010-01-01 20:47:26 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2010-01-02 00:07:00 +0100 |
| commit | 53ade4da49f02bedf5c0e7e0b82d961b3e78cb4d (patch) | |
| tree | 4ba68c78843cb47e102b7c988cb17a96ff8c2438 /systemtap.spec | |
| parent | 72f28cc2cb57bbcc4e773069dad6cf75343fb396 (diff) | |
| download | systemtap-steved-53ade4da49f02bedf5c0e7e0b82d961b3e78cb4d.tar.gz systemtap-steved-53ade4da49f02bedf5c0e7e0b82d961b3e78cb4d.tar.xz systemtap-steved-53ade4da49f02bedf5c0e7e0b82d961b3e78cb4d.zip | |
Add SystemTap_Beginners_Guide to build.
* configure.ac: Add --enable-publican and --with-publican-brand.
Setup "shadow" directory doc/beginners.
* Makefile.in: Regenerated.
* configure: Regenerated.
* doc/Makefile.am (SUBDIRS): Add beginners.
* doc/Makefile.in: Regenerated.
* doc/SystemTap_Beginners_Guide/en-US/Book_Info.xml (productname):
Set to Systemtap.
(productnumber): Set to 1.0.
* SystemTap_Beginners_Guide/en-US/*.xml: Replace includes from
extras/testsuite to ../testsuite,
* doc/SystemTap_Beginners_Guide/publican.cfg: Moved to ...
* doc/SystemTap_Beginners_Guide/publican.cfg.in: ... here.
* doc/SystemTap_Beginners_Guide/Makefile: Removed.
* doc/SystemTap_Beginners_Guide/old-syncandbuild.sh: Removed.
* doc/SystemTap_Beginners_Guide/syncandbuild.sh: Removed.
* doc/SystemTap_Tapset_Reference/Makefile.in: Regenerated.
* doc/beginners/Makefile.am: New makefile.
* doc/beginners/Makefile.in: New generated file.
* grapher/Makefile.in: Regenerated.
* systemtap.spec: Add with_publican and publican_brand.
Diffstat (limited to 'systemtap.spec')
| -rw-r--r-- | systemtap.spec | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/systemtap.spec b/systemtap.spec index 4a60b00b..2ae99e58 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -7,6 +7,8 @@ %{!?pie_supported: %define pie_supported 1} %{!?with_grapher: %define with_grapher 1} %{!?with_boost: %define with_boost 0} +%{!?with_publican: %define with_publican 1} +%{!?publican_brand: %define publican_brand fedora} Name: systemtap Version: 1.1 @@ -60,6 +62,10 @@ BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html # 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 +%if %{with_publican} +BuildRequires: publican +BuildRequires: publican-%{publican_brand} +%endif %endif %if %{with_grapher} @@ -240,8 +246,14 @@ cd .. %define grapher_config --disable-grapher %endif +%if %{with_publican} +%define publican_config --enable-publican --with-publican-brand=%{publican_brand} +%else +%define publican_config --disable-publican +%endif + -%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{rpm_config} --disable-silent-rules +%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{grapher_config} %{publican_config} %{rpm_config} --disable-silent-rules make %{?_smp_mflags} %install @@ -274,6 +286,9 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap mkdir docs.installed mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/ +%if %{with_publican} +mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/ +%endif %endif mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ @@ -381,6 +396,9 @@ exit 0 %if %{with_docs} %doc docs.installed/*.pdf %doc docs.installed/tapsets +%if %{with_publican} +%doc docs.installed/SystemTap_Beginners_Guide +%endif %endif %{_bindir}/stap |