Accepting request 670128 from home:dimstar:Factory

- BuildRequire pkgconfig(systemd) instead of systemd: allow to use
  systemd-mini during build.
- Use %tmpfiles_create macro in -server package: consider the right
  usage in transactional update cases.

OBS-URL: https://build.opensuse.org/request/show/670128
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=105

systemtap-docs.spec

@@ -22,7 +22,7 @@ Release:        0
 Summary:        Documents and examples for systemtap
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Debuggers
-Url:            https://sourceware.org/systemtap/
+URL:            https://sourceware.org/systemtap/
 Source0:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
 Source2:        systemtap.keyring
@@ -31,14 +31,14 @@ Source4:        README-KEYRING
 Patch1:         systemtap-docdir-fix.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 # for documents
 BuildRequires:  fop
 BuildRequires:  gcc-c++
 BuildRequires:  latex2html
 BuildRequires:  libebl-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  texlive-amsfonts
 BuildRequires:  texlive-babel-english
 BuildRequires:  texlive-collection-fontsrecommended
@@ -50,7 +50,6 @@ BuildRequires:  tex(fancyhdr.sty)
 BuildRequires:  tex(fancyvrb.sty)
 BuildRequires:  tex(float.sty)
 BuildRequires:  tex(fullpage.sty)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -66,7 +65,7 @@ This package contains the documents and examples for systemtap.
 find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, %{_bindir}/env,'
 find testsuite examples -type f | xargs chmod 644
 autoreconf -fi
-%configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3 
+%configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3
 make %{?_smp_mflags}
 
 %install

systemtap-headers.spec

@@ -20,7 +20,6 @@
 # packages can make use of the SDT headers without pulling in all
 # build requirements of the normal systemtap package.  Normal use
 # outside of BuildRequires in ring0 packages should use systemtap-sdt-devel
-
 %if ! %{defined _rundir}
 %define _rundir %{_localstatedir}/run
 %endif
@@ -30,10 +29,7 @@ Release:        0
 Summary:        SystemTap headers
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Debuggers
-Url:            http://sourceware.org/systemtap/
+URL:            http://sourceware.org/systemtap/
-# sdt-devel provides the same header files as us, so we
-# must conflict
-Conflicts:      systemtap-sdt-devel
 Source0:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
 Source2:        systemtap.keyring
@@ -41,7 +37,9 @@ Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
 Source5:        stap-server.conf
 Patch1:         systemtap-build-source-dir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# sdt-devel provides the same header files as us, so we
+# must conflict
+Conflicts:      systemtap-sdt-devel
 
 %description
 SystemTap is an instrumentation system for systems running Linux.

systemtap.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 30 13:17:03 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow to use
+  systemd-mini during build.
+- Use %tmpfiles_create macro in -server package: consider the right
+  usage in transactional update cases.
+
 -------------------------------------------------------------------
 Fri Jan  4 18:38:37 UTC 2019 - mgorse@suse.com
 

systemtap.spec

@@ -25,7 +25,7 @@ Release:        0
 Summary:        Instrumentation System
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Debuggers
-Url:            https://sourceware.org/systemtap/
+URL:            https://sourceware.org/systemtap/
 Source0:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source1:        https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
@@ -39,14 +39,13 @@ BuildRequires:  libebl-devel
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  mozilla-nss-tools
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  python3-base
 BuildRequires:  sqlite-devel
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 Requires:       %{name}-runtime = %{version}-%{release}
 Requires:       libebl1
 Obsoletes:      systemtap-client < 1.5
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 SystemTap is an instrumentation system for systems running Linux.
@@ -72,8 +71,6 @@ Requires:       coreutils
 Requires:       mozilla-nss-tools
 Requires:       unzip
 Requires:       zip
-# needed for systemd-tmpfiles
-Requires(post): systemd
 
 %description server
 SystemTap is an instrumentation system for systems running Linux.
@@ -84,8 +81,8 @@ Summary:        Static probe support tools
 # systemtap-headers provides the same header files
 # as sdt-devel, so we must conflict.
 Group:          Development/Tools/Debuggers
-Conflicts:      systemtap-headers
 Requires:       %{name} = %{version}-%{release}
+Conflicts:      systemtap-headers
 
 %description sdt-devel
 SystemTap is an instrumentation system for systems running Linux.
@@ -124,7 +121,7 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d
 
 %post server
 # Create tmpfiles
-systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
+%tmpfiles_create %{_libexecdir}/tmpfiles.d/stap-server.conf
 
 %files
 %defattr(-,root,root)