From e60cd5e75c90fc4bc2bc1c688fb6957041370b6d Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Feb 01 2016 15:00:08 +0000 Subject: Automated weekly systemtap rawhide release: 0.20160201git6706593 --- diff --git a/.gitignore b/.gitignore index afa1115..007194a 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ systemtap-1.3.tar.gz /systemtap-3.0-0.20160111gitf070ea0.tar.gz /systemtap-3.0-0.20160118gite13e9b0.tar.gz /systemtap-3.0-0.20160125gitc5f6801.tar.gz +/systemtap-3.0-0.20160201git6706593.tar.gz diff --git a/sources b/sources index d7e9125..55aba14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9268f8271a8316aaa80f948bdf4af915 systemtap-3.0-0.20160125gitc5f6801.tar.gz +4dd557eaf77ad300b2eedda3c82d8196 systemtap-3.0-0.20160201git6706593.tar.gz diff --git a/systemtap.spec b/systemtap.spec index d6b3525..036434e 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,5 +1,6 @@ %{!?with_sqlite: %global with_sqlite 1} %{!?with_docs: %global with_docs 1} +%{!?with_htmldocs: %global with_htmldocs 0} %{!?with_monitor: %global with_monitor 1} # crash is not available %ifarch ppc ppc64 %{sparc} aarch64 ppc64le @@ -59,7 +60,7 @@ Name: systemtap Version: 3.0 -Release: 0.20160125gitc5f6801%{?dist} +Release: 0.20160201git6706593%{?dist} # for version, see also configure.ac @@ -92,7 +93,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20160125gitc5f6801.tar.gz +Source: %{name}-%{version}-0.20160201git6706593.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -135,12 +136,13 @@ BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) tex(graphicx. # For the html.sty mentioned in the .tex files, even though latex2html is # not run during the build, only during manual scripts/update-docs runs: BuildRequires: latex2html -# +%if %{with_htmldocs} # 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 +%endif %if %{with_emacsvim} BuildRequires: emacs %endif @@ -448,7 +450,11 @@ cd .. %endif %if %{with_docs} -%global docs_config --enable-docs +%if %{with_htmldocs} +%global docs_config --enable-docs --enable-htmldocs +%else +%global docs_config --enable-docs --disable-htmldocs +%endif %else %global docs_config --disable-docs %endif @@ -535,9 +541,11 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap # %doc directive. mkdir docs.installed mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/ +%if %{with_htmldocs} mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/ %endif +%endif mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server @@ -948,9 +956,11 @@ done %license COPYING %if %{with_docs} %doc docs.installed/*.pdf +%if %{with_htmldocs} %doc docs.installed/tapsets/*.html %doc docs.installed/SystemTap_Beginners_Guide %endif +%endif %{_bindir}/stap %{_bindir}/stap-prep %{_bindir}/stap-report @@ -1037,6 +1047,10 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Mon Feb 01 2016 Lukas Berk - 3.0-0.20160201git6706593 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Jan 25 2016 Lukas Berk - 3.0-0.20160125gitc5f6801 - Automated weekly rawhide release - Applied spec changes from upstream git