Accepting request 751331 from Base:System

OBS-URL: https://build.opensuse.org/request/show/751331
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tuned?expand=0&rev=22

_service

@@ -3,9 +3,9 @@
     <param name="scm">git</param>
     <param name="url">https://github.com/redhat-performance/tuned</param>
     <!--
-    <param name="versionformat">2.12.0+git%cd.%h</param>
+    <param name="versionformat">2.22.0+git%cd.%h</param>
     -->
-    <param name="versionformat">2.12.0</param>
+    <param name="versionformat">2.22.0</param>
     <param name="changesgenerate">disable</param>
   </service>
   <service name="recompress" mode="disabled">

tuned-2.12.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8aed81ffa585efd02d511520ab0e20d34af2288e552acbf2a6057085408730b6
-size 149856

tuned-2.22.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d98068273d5b46e260b4ad700032f07505cf1fd9775219a14d42de43c25132cf
+size 152756

tuned.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Nov 26 11:22:52 UTC 2019 - trenn@suse.de
+
+- Update to latest 2.22.0 release
+  includes bug fix for bsc#1139249
+- Use self defined profile_dir instead of _libexecdir
+- Always add pmqos-static.py
+  This was wrongly bound to profiles-nfv package
+- Remove defirqaffinity
+  It is not called anymore. Merge request pending:
+  https://github.com/redhat-performance/tuned/pull/223
+
 -------------------------------------------------------------------
 Mon Jul  1 15:10:26 UTC 2019 - trenn@suse.de
 

tuned.spec

@@ -17,8 +17,11 @@
 
 
 %{!?_tmpfilesdir:%global _tmpfilesdir %{_libexecdir}/tmpfiles.d}
+
+%define         profile_dir %{_prefix}/lib/%{name}
+
 Name:           tuned
-Version:        2.12.0
+Version:        2.22.0
 Release:        0
 Summary:        A dynamic adaptive system tuning daemon
 License:        GPL-2.0-or-later
@@ -50,7 +53,6 @@ Requires:       python3-linux-procfs
 Requires:       python3-pyudev
 Requires:       util-linux
 Requires:       virt-what
-Obsoletes:      pm-profiler
 BuildArch:      noarch
 %{?systemd_requires}
 
@@ -152,14 +154,14 @@ instead of fewer large ones).
 %build
 # The tuned daemon is written in pure Python. Nothing requires to be built.
 # Just a hack to avoid installation in a wrong directory
-sed -i 's|usr/libexec/tuned|%{_libexecdir}/%{name}|' Makefile
+sed -i 's|usr/libexec/tuned|%{profile_dir}|' Makefile
 
 %install
-%make_install
+%make_install TUNED_PROFILESDIR=%{profile_dir}
 %py3_compile %{buildroot}/%{python3_sitelib}
 rm -rf %{buildroot}/%{_datadir}/doc
 # Remove unwanted stuff instead of excluding them in files list
-rm -rf %{buildroot}%{_libexecdir}/%{name}/{default,desktop-powersave,laptop-ac-powersave,server-powersave,laptop-battery-powersave,enterprise-storage,spindown-disk}
+rm -rf %{buildroot}%{profile_dir}/{default,desktop-powersave,laptop-ac-powersave,server-powersave,laptop-battery-powersave,enterprise-storage,spindown-disk}
 rm %{buildroot}%{_mandir}/man7/tuned-profiles-compat.7
 ln -sf service %{buildroot}%{_sbindir}/rctuned
 
@@ -189,7 +191,6 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
 %endif
 
 %files
-
 %dir %{_sysconfdir}/modprobe.d
 %license COPYING
 %doc AUTHORS README
@@ -203,17 +204,18 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
 %exclude %{_sysconfdir}/tuned/realtime-variables.conf
 %exclude %{_sysconfdir}/tuned/realtime-virtual-guest-variables.conf
 %exclude %{_sysconfdir}/tuned/realtime-virtual-host-variables.conf
-%exclude %{_libexecdir}/tuned/realtime-virtual-guest
-%exclude %{_libexecdir}/tuned/realtime-virtual-host
-%exclude %{_libexecdir}/tuned/sap-netweaver
-%exclude %{_libexecdir}/tuned/sap-hana
+%exclude %{profile_dir}/realtime-virtual-guest
+%exclude %{profile_dir}/realtime-virtual-host
+%exclude %{profile_dir}/sap-netweaver
+%exclude %{profile_dir}/sap-hana
 %exclude %{_mandir}/man7/tuned-profiles-sap*.7.gz
-%exclude %{_libexecdir}/tuned/atomic-host
-%exclude %{_libexecdir}/tuned/atomic-guest
-%exclude %{_libexecdir}/tuned/oracle
-%exclude %{_libexecdir}/tuned/realtime
-%exclude %{_libexecdir}/tuned/defirqaffinity*
-%{_libexecdir}/tuned
+%exclude %{profile_dir}/atomic-host
+%exclude %{profile_dir}/atomic-guest
+%exclude %{profile_dir}/oracle
+%exclude %{profile_dir}/realtime
+%exclude %{profile_dir}/defirqaffinity*
+%{profile_dir}/pmqos-static.py
+%{profile_dir}
 # active_profile might be empty when built via build service, but typically
 # not on a real install -> better do not mark it %%ghost
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/active_profile
@@ -251,34 +253,33 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile
 
 %if !0%{?sle_version}
 %files profiles-sap
-%{_libexecdir}/tuned/sap-netweaver
+%{profile_dir}/sap-netweaver
 %{_mandir}/man7/tuned-profiles-sap.7%{?ext_man}
 
 %files profiles-sap-hana
-%{_libexecdir}/tuned/sap-hana
+%{profile_dir}/sap-hana
 %{_mandir}/man7/tuned-profiles-sap-hana.7%{?ext_man}
 %endif
 
 %files profiles-atomic
-%{_libexecdir}/tuned/atomic-host
-%{_libexecdir}/tuned/atomic-guest
+%{profile_dir}/atomic-host
+%{profile_dir}/atomic-guest
 %{_mandir}/man7/tuned-profiles-atomic.7%{?ext_man}
 
 %files profiles-realtime
 %config(noreplace) %{_sysconfdir}/tuned/realtime-variables.conf
-%{_libexecdir}/tuned/realtime
+%{profile_dir}/realtime
 %{_mandir}/man7/tuned-profiles-realtime.7%{?ext_man}
 
 %files profiles-oracle
-%{_libexecdir}/tuned/oracle
+%{profile_dir}/oracle
 %{_mandir}/man7/tuned-profiles-oracle.7%{?ext_man}
 
 %files profiles-nfv
 %config(noreplace) %{_sysconfdir}/tuned/realtime-virtual-guest-variables.conf
 %config(noreplace) %{_sysconfdir}/tuned/realtime-virtual-host-variables.conf
-%{_libexecdir}/tuned/realtime-virtual-guest
-%{_libexecdir}/tuned/realtime-virtual-host
-%{_libexecdir}/tuned/defirqaffinity*
+%{profile_dir}/realtime-virtual-guest
+%{profile_dir}/realtime-virtual-host
 %{_mandir}/man7/tuned-profiles-nfv-*.7%{?ext_man}
 
 %files utils