[packages/systemtap] - remove -Werror to avoid spurious errors - added systemd tmpfiles config for stap-server - grapher

[baggins]

commit 31ca9d340cfa29cc09a2f6139d15e19211f0b1d8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 10 20:27:51 2012 +0200

    - remove -Werror to avoid spurious errors
    - added systemd tmpfiles config for stap-server
    - grapher has been obsoleted and removed

 systemtap-no-Werror.patch | 12 ++++++++++++
 systemtap.spec            | 13 +++++++++++--
 systemtap.tmpfiles        |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/systemtap.spec b/systemtap.spec
index 22af737..8479b8e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -13,9 +13,11 @@ License:	GPL v2+
 Group:		Base
 Source0:	http://sources.redhat.com/systemtap/ftp/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	5b7ab0ae0efc520f0b19f9dbf11977c9
+Source1:	systemtap.tmpfiles
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-rpm5-support.patch
+Patch3:		%{name}-no-Werror.patch
 URL:		http://sourceware.org/systemtap/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -138,12 +140,19 @@ with the optional dtrace-compatibility preprocessor to process related
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd runtime/staprun
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd -
 %configure \
 	--disable-silent-rules \
 	--enable-pie \
@@ -154,11 +163,12 @@ with the optional dtrace-compatibility preprocessor to process related
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/var/cache/%{name},%{systemdtmpfilesdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/var/cache/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/stap-server.conf
 
 %find_lang %{name}
 
@@ -172,7 +182,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/stap
 %attr(755,root,root) %{_bindir}/stap-merge
 %attr(755,root,root) %{_bindir}/stap-report
-%attr(755,root,root) %{_bindir}/stapgraph
 %attr(755,root,root) %{_bindir}/staprun
 %{_datadir}/%{name}
 %{_libexecdir}/%{name}
diff --git a/systemtap-no-Werror.patch b/systemtap-no-Werror.patch
new file mode 100644
index 0000000..e32b0fb
--- /dev/null
+++ b/systemtap-no-Werror.patch
@@ -0,0 +1,12 @@
+--- systemtap-1.8/runtime/staprun/Makefile.am~	2012-06-17 18:27:54.000000000 +0200
++++ systemtap-1.8/runtime/staprun/Makefile.am	2012-09-10 19:28:23.478982153 +0200
+@@ -1,7 +1,7 @@
+ # Makefile.am --- automake input file for systemtap runtime tools
+ 
+-AM_CFLAGS = -Wall -Werror -Wunused -W -Wformat=2 -Wno-format-nonliteral
+-AM_CXXFLAGS = -Wall -Werror -Wunused -W -Wformat=2 -Wno-format-nonliteral
++AM_CFLAGS = -Wall -Wunused -W -Wformat=2 -Wno-format-nonliteral
++AM_CXXFLAGS = -Wall -Wunused -W -Wformat=2 -Wno-format-nonliteral
+ AM_CPPFLAGS = -D_GNU_SOURCE
+ AM_CPPFLAGS += -I$(srcdir)/../../includes
+ AM_CPPFLAGS += -I$(builddir)/../../includes/sys
diff --git a/systemtap.tmpfiles b/systemtap.tmpfiles
new file mode 100644
index 0000000..c52865b
--- /dev/null
+++ b/systemtap.tmpfiles
@@ -0,0 +1 @@
+d /var/run/stap-server 0755 stap-server stap-server -
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemtap.git/commitdiff/31ca9d340cfa29cc09a2f6139d15e19211f0b1d8