- killed systemd stuff, disabled docs (broken build)

diff --git a/stap-server.tmpfiles b/stap-server.tmpfiles
deleted file mode 100644 (file)
index c52865b..0000000
--- a/stap-server.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/stap-server 0755 stap-server stap-server -

diff --git a/systemtap.spec b/systemtap.spec
index 7aee501919f094d041e0b8fc83a70f0aa40c4e3e..5f08c11331269a3d8d67263c068d3946ce46cf7b 100644 (file)
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without doc             # documentation build
+%bcond_with    doc             # documentation build
 %bcond_with    publican        # publican guides build (requires functional publican+wkhtmltopdf)
 %bcond_without crash           # crash extension
 %bcond_without dyninst         # dyninst support
@@ -21,8 +21,6 @@ License:      GPL v2+
 Group:         Base
 Source0:       http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
 # Source0-md5: 65e6745f0ec103758c711dd1d12fb6bf
-Source1:       systemtap.tmpfiles
-Source2:       stap-server.tmpfiles
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-build.patch
 Patch2:                %{name}-rpm5-support.patch
@@ -248,16 +246,13 @@ dtrace, który przetwarza pliki .d na pliki nagłówkowe .h z makrami
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/{cache,run}/%{name},%{systemdtmpfilesdir},%{systemdunitdir}} \
+install -d $RPM_BUILD_ROOT/var/{cache,run}/%{name} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/stap-server/conf.d,/etc/{sysconfig,logrotate.d,rc.d/init.d}} \
        $RPM_BUILD_ROOT/var/log/stap-server
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/systemtap.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/stap-server.conf
-
 # not installed by make
 install stap-prep $RPM_BUILD_ROOT%{_bindir}/stap-prep
 
@@ -267,7 +262,6 @@ install initscript/config.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/conf
 install initscript/stap-server $RPM_BUILD_ROOT/etc/rc.d/init.d
 install initscript/config.stap-server $RPM_BUILD_ROOT/etc/sysconfig/stap-server
 install initscript/logrotate.stap-server $RPM_BUILD_ROOT/etc/logrotate.d/stap-server
-install stap-server.service $RPM_BUILD_ROOT%{systemdunitdir}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/{conf.d,script.d}
 install -d $RPM_BUILD_ROOT/var/lib/stap-server/.systemtap
@@ -298,13 +292,13 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_crash:%attr(755,root,root) %{_libdir}/%{name}/staplog.so}
 %{_mandir}/man1/stap-merge.1*
 %{_mandir}/man1/stap-report.1*
-%{_mandir}/man3/function::*.3stap*
-%{_mandir}/man3/probe::*.3stap*
+#%{_mandir}/man3/function::*.3stap*
+#%{_mandir}/man3/probe::*.3stap*
 %{_mandir}/man3/stapex.3stap*
 %{_mandir}/man3/stapfuncs.3stap*
 %{_mandir}/man3/stapprobes.3stap*
 %{_mandir}/man3/stapvars.3stap*
-%{_mandir}/man3/tapset::*.3stap*
+#%{_mandir}/man3/tapset::*.3stap*
 %{_mandir}/man7/error::*.7stap*
 %{_mandir}/man7/stappaths.7*
 %{_mandir}/man7/warning::debuginfo.7stap*
@@ -345,7 +339,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/systemtap/conf.d
 %dir %{_sysconfdir}/systemtap/script.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemtap/config
-%{systemdtmpfilesdir}/systemtap.conf
 %dir /var/cache/%{name}
 %dir /var/run/%{name}
 
@@ -363,8 +356,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/stap-server
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/stap-server
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/stap-server
-%{systemdunitdir}/stap-server.service
-%{systemdtmpfilesdir}/stap-server.conf
 # TODO: create user/group
 #%attr(750,stap-server,stap-server) %dir /var/lib/stap-server
 #%attr(700,stap-server,stap-server) %dir /var/lib/stap-server/.systemtap

diff --git a/systemtap.tmpfiles b/systemtap.tmpfiles
deleted file mode 100644 (file)
index adbee7f..0000000
--- a/systemtap.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/systemtap 0755 root root -