Accepting request 286556 from home:pluskalm:branches:devel:tools

- Add gpg signature and keyring
- Cleanup spec file with spec-cleaner

- Add keyring and signature
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/286556
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=75
This commit is contained in:
Tony Jones
2015-02-17 21:16:31 +00:00
committed by Git OBS Bridge
parent e6e1e7e95c
commit 572bfcbe48
6 changed files with 1055 additions and 65 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package systemtap
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,22 @@
#
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
Name: systemtap
Version: 2.6
Release: 0
Summary: Instrumentation System
License: GPL-2.0+
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
Source2: %{name}.keyring
Source3: README-BEFORE-ADDING-PATCHES
Source4: stap-server.conf
Patch1: systemtap-build-source-dir.patch
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libcap-devel
@@ -27,25 +42,11 @@ BuildRequires: mozilla-nss-tools
BuildRequires: pkg-config
BuildRequires: sqlite-devel
BuildRequires: systemd
Version: 2.6
Release: 0
Summary: Instrumentation System
License: GPL-2.0+
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
Source: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
Source2: README-BEFORE-ADDING-PATCHES
Source3: stap-server.conf
Patch1: systemtap-build-source-dir.patch
Obsoletes: systemtap-client < 1.5
Requires: %{name}-runtime = %{version}-%{release}
Requires: libebl1
Obsoletes: systemtap-client < 1.5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
%description
SystemTap is an instrumentation system for systems running Linux.
Developers can write instrumentation to collect data on the operation
@@ -63,8 +64,6 @@ This package contains the runtime environment for systemtap programs.
Summary: Systemtap server
Group: Development/Tools/Debuggers
Requires: %{name} = %{version}-%{release}
# needed for systemd-tmpfiles
Requires(post): systemd
# dependancies for systemtap shell scripts
Requires: avahi
Requires: avahi-utils
@@ -72,6 +71,8 @@ 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.
@@ -93,33 +94,30 @@ This package contains the support tools for static probes.
%build
%configure --disable-docs --docdir=%{_docdir}/systemtap
make %{?jobs:-j %jobs}
make %{?_smp_mflags}
%install
%makeinstall
make DESTDIR=%{buildroot} install %{?_smp_mflags}
# XXX
rm -f $RPM_BUILD_ROOT/usr/lib/systemtap/stap-server-request
rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request
# README, AUTHORS, NEWS, man3 and all examples packaged by systemtap-docs
# COPYING needs to stay in main for GPL
rm -rf $RPM_BUILD_ROOT%{_docdir}/systemtap/
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
mkdir -p $RPM_BUILD_ROOT%{_docdir}/systemtap/
cp COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server.log
rm -rf %{buildroot}%{_docdir}/systemtap/
rm -rf %{buildroot}%{_mandir}/man3
mkdir -p %{buildroot}%{_docdir}/systemtap/
cp COPYING %{buildroot}%{_docdir}/systemtap/
mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap
mkdir -p %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/stap-server.log
# config file for stap-server (/var/run now on tmpfs)
mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
install -m 644 %SOURCE3 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d
install -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d
%{find_lang} systemtap
%clean
rm -rf ${RPM_BUILD_ROOT}
%find_lang systemtap
%post server
# Create tmpfiles
systemd-tmpfiles --create /usr/lib/tmpfiles.d/stap-server.conf
systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
%files
%defattr(-,root,root)
@@ -148,8 +146,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/stap-server.conf
%files server
%defattr(-,root,root)
%dir /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/stap-server.conf
%dir %{_libexecdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/stap-server.conf
%{_bindir}/stap-server
%{_libexecdir}/%{name}/stap-gen-cert
%{_libexecdir}/%{name}/stap-serverd