Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2015-02-20 12:42:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemtap" Changes: -------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap-docs.changes 2014-09-17 21:23:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap-docs.changes 2015-02-20 12:42:59.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 17 20:51:58 UTC 2015 - [email protected] + +- Add gpg signature and keyring +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2014-09-17 21:23:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2015-02-20 12:43:00.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 17 20:49:14 UTC 2015 - [email protected] + +- Add keyring and signature +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- New: ---- systemtap-2.6.tar.gz.asc systemtap.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.31L3dA/_old 2015-02-20 12:43:01.000000000 +0100 +++ /var/tmp/diff_new_pack.31L3dA/_new 2015-02-20 12:43:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package systemtap-docs # -# 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 @@ -17,14 +17,26 @@ Name: systemtap-docs +Version: 2.6 +Release: 0 +Summary: Documents and examples for systemtap +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: systemtap.keyring +Source3: README-BEFORE-ADDING-PATCHES +Patch1: systemtap-docdir-fix.diff +Patch2: systemtap-xmlto-fop.diff BuildRequires: autoconf BuildRequires: automake -BuildRequires: gcc-c++ -BuildRequires: libebl-devel -BuildRequires: pkg-config # for documents BuildRequires: fop +BuildRequires: gcc-c++ BuildRequires: latex2html +BuildRequires: libebl-devel +BuildRequires: pkg-config BuildRequires: texlive-amsfonts BuildRequires: texlive-babel-english BuildRequires: texlive-collection-fontsrecommended @@ -36,17 +48,6 @@ BuildRequires: tex(fancyvrb.sty) BuildRequires: tex(float.sty) BuildRequires: tex(fullpage.sty) - -Version: 2.6 -Release: 0 -Summary: Documents and examples for systemtap -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 -Patch1: systemtap-docdir-fix.diff -Patch2: systemtap-xmlto-fop.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -55,32 +56,29 @@ This package contains the documents and examples for systemtap. %prep -%setup -n systemtap-%{version} -q +%setup -q -n systemtap-%{version} %patch1 -p1 %patch2 -p1 %build # fix interpreter -find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, /usr/bin/env,' +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 -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install -%makeinstall doc +make DESTDIR=%{buildroot} install %{?_smp_mflags} doc # COPYING packaged by main spec -cp README AUTHORS NEWS $RPM_BUILD_ROOT%{_docdir}/systemtap/ +cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/ # remove binaries and runtime stuff -rm -rf $RPM_BUILD_ROOT%{_bindir} -rm -rf $RPM_BUILD_ROOT%{_libexecdir} -rm -rf $RPM_BUILD_ROOT%{_datadir}/systemtap -rm -rf $RPM_BUILD_ROOT%{_includedir} +rm -rf %{buildroot}%{_bindir} +rm -rf %{buildroot}%{_libexecdir} +rm -rf %{buildroot}%{_datadir}/systemtap +rm -rf %{buildroot}%{_includedir} # these man pages are in each sub package -rm -rf $RPM_BUILD_ROOT%{_mandir}/man[178] - -%clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot}%{_mandir}/man[178] %files %defattr(-,root,root) ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.31L3dA/_old 2015-02-20 12:43:01.000000000 +0100 +++ /var/tmp/diff_new_pack.31L3dA/_new 2015-02-20 12:43:01.000000000 +0100 @@ -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: 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 @@ 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: 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 @@ %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 - -%{find_lang} systemtap +mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d +install -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d -%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 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
