From 74698f24eb875ad22d164164ececb5541620686a Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Fri, 12 May 2017 20:44:46 -0400 Subject: [PATCH] Automated weekly systemtap rawhide release: 0.20170512gitc67d8f274b21 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 22 +++++++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63f5f0a..bef8415 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /systemtap-3.2-0.20170321git272146660f54.tar.gz /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz /systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz +/systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz diff --git a/sources b/sources index 5de0e8b..5584dff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-3.2-0.20170410gitcbf2583808d6.tar.gz) = 9b4f9d700d12a7ffef7f567127806db10a8dff1dbc7a23bcb844f28ad54e5fe2e7fd5de1dd69956d42b1767e5107962620ec53039db5d453df9b437cbdbe0b63 +SHA512 (systemtap-3.2-0.20170512gitc67d8f274b21.tar.gz) = 1fb2b892692958a63fd2ad0bf2a780ff1a9262686c0c4245f753b485acb63e19bf2fcfcd8aaba63c1dd0365d59dd62e718f0d31081f339f6c79a294847543756 diff --git a/systemtap.spec b/systemtap.spec index 0e3864c..d715b4e 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -35,6 +35,7 @@ %{!?with_python3: %global with_python3 0%{?fedora} >= 23} %{!?with_python2_probes: %global with_python2_probes 1} %{!?with_python3_probes: %global with_python3_probes 0%{?fedora} >= 23} +%{!?with_httpd: %global with_httpd 0} %ifarch ppc64le aarch64 %global with_virthost 0 @@ -72,7 +73,7 @@ Name: systemtap Version: 3.2 -Release: 0.20170410gitcbf2583808d6%{?dist} +Release: 0.20170512gitc67d8f274b21%{?dist} # for version, see also configure.ac @@ -107,7 +108,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20170410gitcbf2583808d6.tar.gz +Source: %{name}-%{version}-0.20170512gitc67d8f274b21.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -186,6 +187,11 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif +%if %{with_httpd} +BuildRequires: libmicrohttpd-devel +BuildRequires: libuuid-devel +%endif + # Install requirements Requires: systemtap-client = %{version}-%{release} Requires: systemtap-devel = %{version}-%{release} @@ -569,10 +575,16 @@ cd .. %global dracut_config %{nil} %endif +%if %{with_httpd} +%global httpd_config --enable-httpd +%else +%global httpd_config --disable-httpd +%endif + # We don't ship compileworthy python code, just oddball samples %global py_auto_byte_compile 0 -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -1139,6 +1151,10 @@ done # PRERELEASE %changelog +* Fri May 12 2017 Frank Ch. Eigler - 3.2-0.20170512gitc67d8f274b21 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Apr 10 2017 Frank Ch. Eigler - 3.2-0.20170410gitcbf2583808d6 - Automated weekly rawhide release - Applied spec changes from upstream git