diff --git a/systemtap.spec b/systemtap.spec index 7d71879..ba4d018 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,25 +1,11 @@ -%define with_boost 1 -%ifnarch arm -%define with_crash 1 -%else -%define with_crash 0 -%endif %define with_docs 0 -%if "%{stage1}" != "1" -%define with_grapher 1 -%else -%define with_grapher 0 -%endif -%define with_pie 1 -%define with_rpm 1 -%define with_sqlite 1 %if %with_docs %define with_publican 0 %endif Name: systemtap -Version: 5.0 -Release: 1mamba +Version: 5.1 +Release: 2mamba Summary: An instrumentation system for Linux systems Group: System/Tools Vendor: openmamba @@ -40,7 +26,6 @@ BuildRequires: libncurses-devel BuildRequires: libnspr-devel BuildRequires: libnss-devel BuildRequires: libperl -BuildRequires: libpython27-devel BuildRequires: libpython311-devel BuildRequires: libreadline-devel BuildRequires: librpm-devel @@ -53,23 +38,12 @@ BuildRequires: perl-HTML-Parser BuildRequires: perl-devel ## AUTOBUILDREQ-END BuildRequires: librpm-devel >= 4.16.1.2-1mamba -#%if %with_grapher -#BuildRequires: libglademm-devel -#BuildRequires: libgtkmm-devel -#%endif BuildRequires: libnss-tools -%if %with_boost -BuildRequires: libboost-devel -%endif -%if %with_crash BuildRequires: crash-devel BuildRequires: libz-devel Requires: crash -%endif BuildRequires: pkgconfig -%if %with_rpm BuildRequires: rpm-devel -%endif # docs %if %with_docs BuildRequires: ghostscript @@ -95,7 +69,6 @@ Developers can write instrumentation to collect data on the operation of the sys Group: System/Tools Summary: Instrumentation System Client Requires: %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release} -#Requires: avahi Requires: coreutils Requires: libnss Requires: libnss-tools @@ -103,7 +76,6 @@ Requires: libnss-tools %description client SystemTap client is the client component of an instrumentation system for systems running Linux 2.6. Developers can write instrumentation to collect data on the operation of the system. -%if %with_grapher %package grapher Summary: Instrumentation System Grapher Group: System/Tools @@ -111,13 +83,11 @@ Requires: %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release} %description grapher SystemTap grapher is a utility for real-time visualization of data from SystemTap instrumentation scripts. -%endif %package runtime Group: System/Tools Summary: Instrumentation System Runtime Requires: kernelheaders -#Requires: shadow %description runtime SystemTap runtime is the runtime component of an instrumentation system for systems running Linux 2.6. Developers can write instrumentation to collect data on the operation of the system. @@ -178,11 +148,9 @@ Python bindings to Systemtap. %build %configure \ -%if %with_crash + --with-python3 \ + --without-python2-probes \ --enable-crash \ -%else - --disable-crash \ -%endif %if %with_docs --enable-docs \ %if %with_publican @@ -192,31 +160,12 @@ Python bindings to Systemtap. %else --disable-docs \ %endif -%if %with_sqlite --enable-sqlite \ -%else - --disable-sqlite \ -%endif -%if %with_rpm --with-rpm \ -%else - --without-rpm \ -%endif -%if %with_pie --enable-pie \ -%else - --disable-pie \ -%endif -%if %with_grapher --enable-grapher \ -%else - --disable-grapher \ -%endif --disable-silent-rules \ - CXXFLAGS="%{optflags} -Wno-dangling-pointer" \ -%ifarch arm - CPPFLAGS="%{optflags} -Wno-error=ignored-qualifiers" -%endif + CXXFLAGS="%{optflags} -Wno-dangling-pointer" %make @@ -234,15 +183,6 @@ install -c -m 755 stap-prep %{buildroot}%{_bindir}/stap-prep cp -rp testsuite %{buildroot}%{_datadir}/systemtap -#mkdir -p %{buildroot}%{_sysconfdir}//rc.d/init.d/ -#install -m 755 initscript/systemtap %{buildroot}%{_sysconfdir}/rc.d/init.d/ -#mkdir -p %{buildroot}%{_sysconfdir}/systemtap -#mkdir -p %{buildroot}%{_sysconfdir}/systemtap/conf.d -#mkdir -p %{buildroot}%{_sysconfdir}/systemtap/script.d -#install -m 644 initscript/config.systemtap %{buildroot}%{_sysconfdir}/systemtap/config -#mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap -#mkdir -p %{buildroot}%{_localstatedir}/run/systemtap - %if %with_docs mkdir docs.installed mv %{buildroot}%{_datadir}/doc/systemtap/*.pdf docs.installed/ @@ -332,10 +272,6 @@ fi %dir %{_datadir}/systemtap/runtime/linux %{_datadir}/systemtap/runtime/linux/*.c %{_datadir}/systemtap/runtime/linux/*.h -%dir %attr(0775,root,stap-server) %{_datadir}/systemtap/runtime/linux/uprobes -%{_datadir}/systemtap/runtime/linux/uprobes/* -%dir %{_datadir}/systemtap/runtime/linux/uprobes2 -%{_datadir}/systemtap/runtime/linux/uprobes2/* %{_datadir}/systemtap/tapset %{_mandir}/man1/stap*.1* %{_mandir}/man3/stap*.3stap* @@ -348,44 +284,13 @@ fi %lang(cs) %{_mandir}/cs/man*/ %doc AUTHORS COPYING -#%files client -#%defattr(-,root,root) -#%{_bindir}/stap-client -#%{_libexecdir}/systemtap/stap-find-servers -#%{_libexecdir}/systemtap/stap-client-connect -#%{_mandir}/man8/stap-client.8.gz - -#%if %with_grapher -#%files grapher -#%defattr(-,root,root) -#%{_bindir}/stapgraph -#%{_datadir}/systemtap/*.glade -#%{_mandir}/man1/stapgraph.1.gz -#%endif - -#%files initscript -#%defattr(-,root,root) -#%{_sysconfdir}/rc.d/init.d/systemtap -#%dir %{_sysconfdir}/systemtap -#%dir %{_sysconfdir}/systemtap/conf.d -#%dir %{_sysconfdir}/systemtap/script.d -#%config(noreplace) %{_sysconfdir}/systemtap/config -#%dir %{_localstatedir}/cache/systemtap -#%dir %{_localstatedir}/run/systemtap - %files runtime %defattr(-,root,root) %attr(4111,root,root) %{_bindir}/staprun -#%{_bindir}/stap-authorize-server-cert -#%{_bindir}/stap-authorize-signing-cert %{_libexecdir}/systemtap/stapio %{_libexecdir}/systemtap/stap-env %{_libexecdir}/systemtap/stap-authorize-cert -%if %with_crash %{_libdir}/systemtap/staplog.so* -%endif -#%{_mandir}/man8/stap-authorize-server-cert.8.gz -#%{_mandir}/man8/stap-authorize-signing-cert.8.gz %{_mandir}/man8/staprun.8* %files sdt-devel @@ -417,7 +322,6 @@ fi %files server %defattr(-,root,root) -#%{_sysconfdir}/rc.d/init.d/stap-server %config(noreplace) %{_sysconfdir}/logrotate.d/stap-server %dir %{_sysconfdir}/stap-server %dir %{_sysconfdir}/stap-server/conf.d @@ -425,10 +329,7 @@ fi %{_libexecdir}/systemtap/stap-serverd %{_libexecdir}/systemtap/stap-start-server %{_libexecdir}/systemtap/stap-stop-server -#%{_libexecdir}/systemtap/stap-find-servers -#%{_libexecdir}/systemtap/stap-find-or-start-server %{_libexecdir}/systemtap/stap-gen-cert -#%{_libexecdir}/systemtap/stap-server-connect %{_libexecdir}/systemtap/stap-sign-module %config(noreplace) %{_sysconfdir}/sysconfig/stap-server %dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server @@ -444,10 +345,6 @@ fi %files -n python-systemtap %defattr(-,root,root) -%dir %{python27_sitearch}/HelperSDT-*-py2.7.egg-info -%{python27_sitearch}/HelperSDT-*-py2.7.egg-info/* -%dir %{python27_sitearch}/HelperSDT -%{python27_sitearch}/HelperSDT/* %dir %{python3_sitearch}/HelperSDT-*-py3.*.egg-info %{python3_sitearch}/HelperSDT-0.1.0-py3.*.egg-info/* %dir %{python3_sitearch}/HelperSDT @@ -455,6 +352,12 @@ fi %{_libexecdir}/systemtap/python/stap-resolve-module-function.py %changelog +* Mon May 13 2024 Silvan Calarco 5.1-2mamba +- rebuild with only python3 + +* Sun May 12 2024 Automatic Build System 5.1-1mamba +- automatic version update by autodist + * Tue Nov 21 2023 Automatic Build System 5.0-1mamba - automatic version update by autodist