From 65e6c77904dc43cffbfda5abd2491a4e50e3e4e5 Mon Sep 17 00:00:00 2001 From: Hubbitus Date: Sat, 7 Nov 2015 23:26:55 +0300 Subject: [PATCH] 4.2.5-300.hu.1.pf3 - Update to Fedora23. - Merge fc23 branch. - Adjust hibernate-Disable-in-a-signed-modules-environment.patch. --- hibernate-Disable-in-a-signed-modules-environment.patch | 2 +- kernel.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch index 9450e8bf3..81951e478 100644 --- a/hibernate-Disable-in-a-signed-modules-environment.patch +++ b/hibernate-Disable-in-a-signed-modules-environment.patch @@ -23,7 +23,7 @@ index 690f78f210f2..037303a1cba9 100644 +#include #include - #include "power.h" + #include "tuxonice.h" @@ -66,7 +67,7 @@ static const struct platform_hibernation_ops *hibernation_ops; bool hibernation_available(void) diff --git a/kernel.spec b/kernel.spec index 829ed6f0c..c5670e3a0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -464,7 +464,7 @@ Source2001: cpupower.config # For a stable release kernel %if 0%{?stable_update} %if 0%{?stable_base} -#%define stable_patch_00 patch-4.%{base_sublevel}.%{stable_base}.xz +#%%define stable_patch_00 patch-4.%%{base_sublevel}.%%{stable_base}.xz %global stable_patch_00 https://pf.natalenko.name/sources/4.2/patch-4.2-pf3.xz Source5000: %{stable_patch_00} %endif @@ -2111,6 +2111,11 @@ fi # and build. # %changelog +* Sat Nov 07 2015 Pavel Alexeev - 4.2.5-300.hu.1.pf3 +- Update to Fedora23. +- Merge fc23 branch. +- Adjust hibernate-Disable-in-a-signed-modules-environment.patch. + * Thu Nov 05 2015 Pavel Alexeev - 4.2.5-201.hu.1.pf3.fc22 - Update to pf3 - v4.2-pf3: https://pf.natalenko.name/forum/index.php?topic=363.0 - 4.2.5-201.hu.1.pf3