Automated weekly systemtap rawhide release: 0.20180906git37598c4fee7c

systemtap.spec

@@ -80,11 +80,11 @@
 %endif
 
 # To avoid testsuite/*/*.stp has shebang which doesn't start with '/'
-%undefine __brp_mangle_shebangs  
+%define __brp_mangle_shebangs_exclude_from .stp$
 
 Name: systemtap
 Version: 4.0
-Release: 0.20180810git%{?dist}
+Release: 0.20180906git37598c4fee7c%{?dist}
 # for version, see also configure.ac
 
 
@@ -119,10 +119,11 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20180810git.tar.gz
+Source: %{name}-%{version}-0.20180906git37598c4fee7c.tar.gz
 
 # Build*
 BuildRequires: gcc-c++
+BuildRequires: cpio
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(avahi-client)
@@ -463,14 +464,14 @@ that probe python 3 processes.
 %endif
 
 %if %{with_python3}
-%package stap-exporter
+%package exporter
 Summary: Systemtap-prometheus interoperation mechanism
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 
-%description stap-exporter
+%description exporter
 This package includes files for a systemd service that manages
 systemtap sessions and relays prometheus metrics from the sessions
 to remote requesters on demand.
@@ -774,13 +775,6 @@ done
    touch $RPM_BUILD_ROOT%{dracutstap}/params.conf
 %endif
 
-%if %{with_python3}
-   mkdir -p $RPM_BUILD_ROOT/stap-exporter
-   install -p -m 755 stap-exporter/stap-exporter $RPM_BUILD_ROOT%{_bindir}
-   install -m 644 stap-exporter/stap-exporter.service $RPM_BUILD_ROOT%{_unitdir}
-   install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8
-%endif
-
 %pre runtime
 getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr
 getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys
@@ -957,11 +951,22 @@ fi
 exit 0
 
 %if %{with_python3}
-%preun stap-exporter
-/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
-/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
-%endif
+%if %{with_systemd}
+%preun exporter
+if [ $1 = 0 ] ; then
+  /bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
+  /bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
+fi
+exit 0
 
+%postun exporter
+# Restart service if this is an upgrade rather than an uninstall
+if [ "$1" -ge "1" ]; then
+   /bin/systemctl condrestart stap-exporter >/dev/null 2>&1 || :
+fi
+exit 0
+%endif
+%endif
 
 %post
 # Remove any previously-built uprobes.ko materials
@@ -1249,10 +1254,12 @@ done
 %endif
 
 %if %{with_python3}
-%files stap-exporter
+%files exporter
+%{_sysconfdir}/stap-exporter
+%{_sysconfdir}/sysconfig/stap-exporter
 %{_unitdir}/stap-exporter.service
 %{_mandir}/man8/stap-exporter.8*
-%{_bindir}/stap-exporter
+%{_sbindir}/stap-exporter
 %endif
 
 # ------------------------------------------------------------------------
@@ -1264,6 +1271,10 @@ done
 
 # PRERELEASE
 %changelog
+* Thu Sep 06 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-0.20180906git37598c4fee7c
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Fri Aug 10 2018 Frank Ch. Eigler <fche@redhat.com> - 4.0-0.20180810git
 - Automated weekly rawhide release
 - Applied spec changes from upstream git