From 5698c9e006e650f93456cffc42b50c61016fe1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Sun, 1 Dec 2019 17:04:18 +0100
Subject: [PATCH] new release   rebased tuned to latest upstream     resolves:
 rhbz#1738250   cpu: fixed checking if EPB is supported     resolves:
 rhbz#1690929   scheduler: fixed IRQ SMP affinity verification to respect
 ignore_missing     resolves: rhbz#1729936   realtime: enabled
 ktimer_lockless_check     resolves: rhbz#1734096   plugins: support
 cpuinfo_regex and uname_regex matching     resolves: rhbz#1748965   sysctl:
 made reapply_sysctl ignore configs from /usr     resolves: rhbz#1759597  
 added support for multiple include directives     resolves: rhbz#1760390  
 realtime: added nowatchdog kernel command line option     resolves:
 rhbz#1767614

---
 sources    |  2 +-
 tuned.spec | 43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index b5ce57d..4360a9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tuned-2.12.0.tar.gz) = f3b5ad5ed1ef69860fea7d408ff3cc07c544bd9e804a606b902929c1c75331942ed6e949b5debafbdf9ca51efec2b3a8b6fac8d723f933a458eecaab46ae5c12
+SHA512 (tuned-2.13.0-rc.1.tar.gz) = c5d790f1d9f2d35a9e4cd1946578af4b912112e35182e01237b19ada2e48b052acc52484649b278b494ce3555979dd593a03bfda87d9ce6f01bfa318cc854794
diff --git a/tuned.spec b/tuned.spec
index 9eac9dc..b06befa 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -25,16 +25,16 @@
 %endif
 %endif
 
-#%%global prerelease rc
-#%%global prereleasenum 1
+%global prerelease rc
+%global prereleasenum 1
 
 %global prerel1 %{?prerelease:.%{prerelease}%{prereleasenum}}
 %global prerel2 %{?prerelease:-%{prerelease}.%{prereleasenum}}
 
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 2.12.0
-Release: 4%{?prerel1}%{?dist}
+Version: 2.13.0
+Release: 0.1%{?prerel1}%{?dist}
 License: GPLv2+
 Source0: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}/%{name}-%{version}%{?prerel2}.tar.gz
 URL: http://www.tuned-project.org/
@@ -49,15 +49,22 @@ Requires(post): systemd, virt-what
 Requires(preun): systemd
 Requires(postun): systemd
 BuildRequires: %{_py}, %{_py}-devel
+# BuildRequires for 'make test'
+BuildRequires: %{_py}-unittest2, %{_py}-configobj, %{_py}-mock
+BuildRequires: %{_py}-decorator, %{_py}-pyudev
 Requires: %{_py}-decorator, %{_py}-pyudev, %{_py}-configobj
 Requires: %{_py}-schedutils, %{_py}-linux-procfs, %{_py}-perf
 # requires for packages with inconsistent python2/3 names
 %if %{with python3}
+# BuildRequires for 'make test'
+BuildRequires: python3-dbus, python3-gobject-base
 Requires: python3-dbus, python3-gobject-base
 %if 0%{?fedora} > 22 || 0%{?rhel} > 7
 Recommends: python3-dmidecode
 %endif
 %else
+# BuildRequires for 'make test'
+BuildRequires: dbus-python, pygobject3-base
 Requires: dbus-python, pygobject3-base
 %if 0%{?fedora} > 22 || 0%{?rhel} > 7
 Recommends: python-dmidecode
@@ -217,7 +224,11 @@ It can be also used to fine tune your system for specific scenarios.
 %setup -q -n %{name}-%{version}%{?prerel2}
 
 %build
+# Docs cannot be generated on RHEL now due to missing asciidoctor dependency
+# asciidoc doesn't seem to be compatible
+%if ! 0%{?rhel}
 make html %{make_python_arg}
+%endif
 
 %install
 make install DESTDIR=%{buildroot} DOCDIR=%{docdir} %{make_python_arg}
@@ -225,8 +236,10 @@ make install DESTDIR=%{buildroot} DOCDIR=%{docdir} %{make_python_arg}
 sed -i 's/\(dynamic_tuning[ \t]*=[ \t]*\).*/\10/' %{buildroot}%{_sysconfdir}/tuned/tuned-main.conf
 %endif
 
+%if ! 0%{?rhel}
 # manual
 make install-html DESTDIR=%{buildroot} DOCDIR=%{docdir}
+%endif
 
 # conditional support for grub2, grub2 is not available on all architectures
 # and tuned is noarch package, thus the following hack is needed
@@ -244,6 +257,9 @@ touch %{buildroot}%{_sysconfdir}/modprobe.d/kvm.rt.tuned.conf
 # validate desktop file
 desktop-file-validate %{buildroot}%{_datadir}/applications/tuned-gui.desktop
 
+%check
+make test
+
 %post
 %systemd_post tuned.service
 
@@ -460,6 +476,25 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Sun Dec  1 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.13.0-0.1.rc1
+- new release
+  - rebased tuned to latest upstream
+    resolves: rhbz#1738250
+  - cpu: fixed checking if EPB is supported
+    resolves: rhbz#1690929
+  - scheduler: fixed IRQ SMP affinity verification to respect ignore_missing
+    resolves: rhbz#1729936
+  - realtime: enabled ktimer_lockless_check
+    resolves: rhbz#1734096
+  - plugins: support cpuinfo_regex and uname_regex matching
+    resolves: rhbz#1748965
+  - sysctl: made reapply_sysctl ignore configs from /usr
+    resolves: rhbz#1759597
+  - added support for multiple include directives
+    resolves: rhbz#1760390
+  - realtime: added nowatchdog kernel command line option
+    resolves: rhbz#1767614
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.12.0-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)