diff --git a/sources b/sources index 98b6894..538d133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c72dd8afd24f0f5db81206d432eb75a2 tuned-2.4.0.tar.bz2 +52f50aa2d53ca95206e5c19b8d978ac6 tuned-2.4.1.tar.bz2 diff --git a/tuned-2.4.0-polkit-tuned-gui-path.patch b/tuned-2.4.0-polkit-tuned-gui-path.patch deleted file mode 100644 index fd7d98d..0000000 --- a/tuned-2.4.0-polkit-tuned-gui-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/org.tuned.gui.policy b/org.tuned.gui.policy -index 58b6209..68b15d8 100644 ---- a/org.tuned.gui.policy -+++ b/org.tuned.gui.policy -@@ -10,7 +10,7 @@ - auth_admin - auth_admin - -- /usr/bin/tuned-gui -+ /usr/sbin/tuned-gui - true - - diff --git a/tuned.spec b/tuned.spec index 6a7f8e9..3c96cdf 100644 --- a/tuned.spec +++ b/tuned.spec @@ -1,6 +1,6 @@ Summary: A dynamic adaptive system tuning daemon Name: tuned -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} License: GPLv2+ Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2 @@ -13,7 +13,6 @@ Requires(postun): systemd Requires: python-decorator, dbus-python, pygobject3-base, python-pyudev Requires: virt-what, python-configobj, ethtool, gawk, kernel-tools, hdparm Requires: util-linux -Patch0: tuned-2.4.0-polkit-tuned-gui-path.patch %description The tuned package contains a daemon that tunes system settings dynamically. @@ -82,7 +81,6 @@ It can be also used to fine tune your system for specific scenarios. %prep %setup -q -%patch0 -p1 %build @@ -94,6 +92,11 @@ make install DESTDIR=%{buildroot} sed -i 's/\(dynamic_tuning[ \t]*=[ \t]*\).*/\10/' %{buildroot}%{_sysconfdir}/tuned/tuned-main.conf %endif +# 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 +mv %{buildroot}%{_sysconfdir}/grub.d/00_tuned %{buildroot}%{_datadir}/tuned/grub2/00_tuned +rmdir %{buildroot}%{_sysconfdir}/grub.d %post %systemd_post tuned.service @@ -116,6 +119,14 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile /usr/sbin/chkconfig --del ktune &>/dev/null || : +%posttrans +# conditional support for grub2, grub2 is not available on all architectures +# and tuned is noarch package, thus the following hack is needed +if [ -d %{_sysconfdir}/grub.d ]; then + cp -a %{_datadir}/tuned/grub2/00_tuned %{_sysconfdir}/grub.d/00_tuned +fi + + %files %defattr(-,root,root,-) %doc AUTHORS @@ -145,7 +156,6 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile %config(noreplace) %{_sysconfdir}/tuned/tuned-main.conf %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline %{_sysconfdir}/dbus-1/system.d/com.redhat.tuned.conf -%{_sysconfdir}/grub.d/00_tuned %{_tmpfilesdir}/tuned.conf %{_unitdir}/tuned.service %dir %{_localstatedir}/log/tuned @@ -154,6 +164,7 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile %{_mandir}/man7/tuned-profiles.7* %{_mandir}/man8/tuned* %dir %{_datadir}/tuned +%{_datadir}/tuned/grub2 %files gtk %defattr(-,root,root,-) @@ -210,6 +221,19 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile %{_mandir}/man7/tuned-profiles-compat.7* %changelog +* Thu Oct 16 2014 Jaroslav Škarvada - 2.4.1-1 +- new-release + - fixed return code of tuned grub template + resolves: rhbz#1151768 + - plugin_bootloader: fix for multiple parameters on command line + related: rhbz#1148711 + - tuned-adm: fixed traceback on "tuned-adm list" + resolves: rhbz#1149162 + - plugin_bootloader is automatically disabled if grub2 is not found + resolves: rhbz#1150047 + - plugin_disk: set_spindown and set_APM made independent + resolves: rhbz#976725 + * Wed Oct 1 2014 Jaroslav Škarvada - 2.4.0-1 - new-release resolves: rhbz#1093883