From 3389e183b6b6d29b17fe26c5d24eb0bf35aeebed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 22 Mar 2019 00:01:32 +0100
Subject: [PATCH] new release   rebased tuned to latest upstream     related:
 rhbz#1643654   used dmidecode only on x86 architectures     resolves:
 rhbz#1688371   recommend: fixed to work without tuned daemon running    
 resolves: rhbz#1687397   powertop2tuned: added support for wakeup tuning
 (powertop-2.10)     resolves: rhbz#1690354

---
 sources                                       |  2 +-
 ....0-powertop2tuned-add-wakeup-support.patch | 13 +++++++
 tuned.spec                                    | 37 ++++++++++++++-----
 3 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 tuned-2.11.0-powertop2tuned-add-wakeup-support.patch

diff --git a/sources b/sources
index 9e9ac92..f1f8966 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tuned-2.11.0-rc.1.tar.gz) = 95fba1698bb4b4d938e113f3c78413253aa2c4580c8794f860e8d6efabe83f3e8905c36603910ec8af95880f128f7cabe4a01127392920078dcb2a4206b01f42
+SHA512 (tuned-2.11.0.tar.gz) = d3ce400f73bc868bafe34433c9b7c1c425e744e70559b86808b59c7820c6baefc41b435eeeb5e6fdbcc28731cee079e6adeb709615cb9c778dc316d69527b0a9
diff --git a/tuned-2.11.0-powertop2tuned-add-wakeup-support.patch b/tuned-2.11.0-powertop2tuned-add-wakeup-support.patch
new file mode 100644
index 0000000..52adc89
--- /dev/null
+++ b/tuned-2.11.0-powertop2tuned-add-wakeup-support.patch
@@ -0,0 +1,13 @@
+diff --git a/experiments/powertop2tuned.py b/experiments/powertop2tuned.py
+index ec69d97..76d048a 100755
+--- a/experiments/powertop2tuned.py
++++ b/experiments/powertop2tuned.py
+@@ -96,7 +96,7 @@ class PowertopHTMLParser(HTMLParser):
+ 
+ 	def handle_starttag(self, tag, attrs):
+ 		self.lastStartTag = tag
+-		if self.lastStartTag == "div" and dict(attrs).get("id")  == "tuning":
++		if self.lastStartTag == "div" and dict(attrs).get("id")  in ["tuning", "wakeup"]:
+ 			self.inProperTable = True
+ 		if self.inProperTable and tag == "td":
+ 			self.tdCounter += 1
diff --git a/tuned.spec b/tuned.spec
index 35f6abc..08b2d16 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -14,8 +14,10 @@
 
 %if %{with python3}
 %global _py python3
+%global make_python_arg PYTHON=%{__python3}
 %else
 %{!?python2_sitelib:%global python2_sitelib %{python_sitelib}}
+%global make_python_arg PYTHON=%{__python2}
 %if 0%{?rhel} && 0%{?rhel} < 8
 %global _py python
 %else
@@ -23,8 +25,8 @@
 %endif
 %endif
 
-%global prerelease rc
-%global prereleasenum 1
+#%%global prerelease rc
+#%%global prereleasenum 1
 
 %global prerel1 %{?prerelease:.%{prerelease}%{prereleasenum}}
 %global prerel2 %{?prerelease:-%{prerelease}.%{prereleasenum}}
@@ -32,12 +34,17 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.11.0
-Release: 0.1%{?prerel1}%{?dist}
+Release: 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/
 BuildArch: noarch
 BuildRequires: systemd, desktop-file-utils
+%if 0%{?rhel}
+BuildRequires: asciidoc
+%else
+BuildRequires: asciidoctor
+%endif
 Requires(post): systemd, virt-what
 Requires(preun): systemd
 Requires(postun): systemd
@@ -64,6 +71,7 @@ Recommends: kernel-tools
 %if 0%{?rhel} > 7
 Requires: python3-syspurpose
 %endif
+Patch0: tuned-2.11.0-powertop2tuned-add-wakeup-support.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -208,20 +216,20 @@ It can be also used to fine tune your system for specific scenarios.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel2}
+%patch0 -p1
 
 %build
+make html %{make_python_arg}
 
 %install
-make install DESTDIR=%{buildroot} DOCDIR=%{docdir} \
-%if %{with python3}
-	PYTHON=%{__python3}
-%else
-	PYTHON=%{__python2}
-%endif
+make install DESTDIR=%{buildroot} DOCDIR=%{docdir} %{make_python_arg}
 %if 0%{?rhel}
 sed -i 's/\(dynamic_tuning[ \t]*=[ \t]*\).*/\10/' %{buildroot}%{_sysconfdir}/tuned/tuned-main.conf
 %endif
 
+# manual
+make install-html DESTDIR=%{buildroot} DOCDIR=%{docdir}
+
 # conditional support for grub2, grub2 is not available on all architectures
 # and tuned is noarch package, thus the following hack is needed
 mkdir -p %{buildroot}%{_datadir}/tuned/grub2
@@ -458,6 +466,17 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Thu Mar 21 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-1
+- new release
+  - rebased tuned to latest upstream
+    related: rhbz#1643654
+  - used dmidecode only on x86 architectures
+    resolves: rhbz#1688371
+  - recommend: fixed to work without tuned daemon running
+    resolves: rhbz#1687397
+  - powertop2tuned: added support for wakeup tuning (powertop-2.10)
+    resolves: rhbz#1690354
+
 * Sun Mar 10 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-0.1.rc1
 - new release
   - rebased tuned to latest upstream