diff --git a/.gitignore b/.gitignore index af75e51..8fb55d2 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ systemtap-1.3.tar.gz /systemtap-2.8-0.20.g784e796f37c8.tar.gz /systemtap-2.8-0.38.g3965aacd37c7.tar.gz /systemtap-2.8-0.55.g07a1c230b47d.tar.gz +/systemtap-2.8-0.20150330gitd31dab9.tar.gz diff --git a/sources b/sources index f95c6b5..c6b65d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02b0094605efde47edf76685cec0729b systemtap-2.8-0.55.g07a1c230b47d.tar.gz +1c9c2bf660091b7100cb241ade8d5d0d systemtap-2.8-0.20150330gitd31dab9.tar.gz diff --git a/systemtap.spec b/systemtap.spec index db3401c..e4d705f 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -11,16 +11,6 @@ %{!?elfutils_version: %global elfutils_version 0.142} %{!?pie_supported: %global pie_supported 1} %{!?with_boost: %global with_boost 0} -%ifarch ppc ppc64 %{sparc} aarch64 ppc64le -%{!?with_publican: %global with_publican 0} -%else -%{!?with_publican: %global with_publican 1} -%endif -%if 0%{?rhel} -%{!?publican_brand: %global publican_brand RedHat} -%else -%{!?publican_brand: %global publican_brand fedora} -%endif %ifarch %{ix86} x86_64 ppc ppc64 %{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7} %else @@ -68,7 +58,7 @@ Name: systemtap Version: 2.8 -Release: 0.55.g07a1c230b47d%{?dist} +Release: 0.20150330gitd31dab9%{?dist} # for version, see also configure.ac @@ -101,7 +91,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.55.g07a1c230b47d.tar.gz +Source: %{name}-%{version}-0.20150330gitd31dab9.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -142,14 +132,6 @@ BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) # 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: /usr/share/publican/Common_Content/%{publican_brand}/defaults.cfg - -# A workaround for BZ920216 which requires an X server to build docs -# with publican. -BuildRequires: /usr/bin/xvfb-run -%endif %endif %if %{with_emacsvim} BuildRequires: emacs @@ -458,11 +440,6 @@ cd .. %global pie_config --disable-pie %endif -%if %{with_publican} -%global publican_config --enable-publican --with-publican-brand=%{publican_brand} -%else -%global publican_config --disable-publican -%endif %if %{with_java} %global java_config --with-java=%{_jvmdir}/java @@ -476,7 +453,7 @@ cd .. %global virt_config --disable-virt %endif -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{publican_config} %{rpm_config} %{java_config} %{virt_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} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} %if %{with_emacsvim} @@ -520,10 +497,8 @@ 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}/stap-server mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server @@ -947,10 +922,8 @@ done %if %{with_docs} %doc docs.installed/*.pdf %doc docs.installed/tapsets/*.html -%if %{with_publican} %doc docs.installed/SystemTap_Beginners_Guide %endif -%endif %{_bindir}/stap %{_bindir}/stap-prep %{_bindir}/stap-report @@ -1036,6 +1009,10 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Mon Mar 30 2015 Lukas Berk - 2.8-0.20150330gitd31dab9 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Mar 23 2015 Lukas Berk - 2.8-0.55.g07a1c230b47d - Automated weekly rawhide release - Applied spec changes from upstream git