- updated to 2.0.15

- removed obsolete format patch

diff --git a/kexec-tools-format.patch b/kexec-tools-format.patch
deleted file mode 100644 (file)
index 92e5e4e..0000000
--- a/kexec-tools-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kexec-tools-2.0.5/kexec/arch/i386/kexec-elf-x86.c.orig     2013-11-19 02:06:56.000000000 +0100
-+++ kexec-tools-2.0.5/kexec/arch/i386/kexec-elf-x86.c  2014-02-08 07:18:28.278243195 +0100
-@@ -299,6 +299,6 @@
-       free(command_line);
-       free(modified_cmdline);
-       if (error_msg)
--              die(error_msg);
-+              die("%s", error_msg);
-       return result;
- }
---- kexec-tools-2.0.5/kexec/arch/x86_64/kexec-elf-x86_64.c.orig        2013-11-19 02:06:56.000000000 +0100
-+++ kexec-tools-2.0.5/kexec/arch/x86_64/kexec-elf-x86_64.c     2014-02-08 08:44:21.892859870 +0100
-@@ -276,6 +276,6 @@
-       free(command_line);
-       free(modified_cmdline);
-       if (error_msg)
--              die(error_msg);
-+              die("%s", error_msg);
-       return result;
- }

diff --git a/kexec-tools.spec b/kexec-tools.spec
index a63e38f36e0c6d6a373eda7f78be560634a3a62f..b11f1502abe2bc3904875b2db648b12573da8752 100644 (file)
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -11,18 +11,17 @@
 Summary:       Tool for starting new kernel without reboot
 Summary(pl.UTF-8):     Narzędzie pozwalające załadować nowe jądro bez konieczności restartu
 Name:          kexec-tools
-Version:       2.0.14
+Version:       2.0.15
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
-# Source0-md5: 4164abff8ed21e9f94d57f535c2f77bf
+# Source0-md5: 76f5ea9e36ebaf605d0d7ec2e50d6ac6
 Source1:       kexec.init
 Source2:       kexec.sysconfig
-Patch0:                %{name}-format.patch
-Patch1:                %{name}-xen.patch
+Patch0:                %{name}-xen.patch
 # from http://patchwork.openembedded.org/patch/90971/raw/
-Patch2:                %{name}-x32.patch
+Patch1:                %{name}-x32.patch
 URL:           https://www.kernel.org/pub/linux/utils/kernel/kexec/
 BuildRequires: autoconf >= 2.50
 BuildRequires: rpmbuild(macros) >= 1.228
@@ -54,7 +53,6 @@ działać na każdej architekturze.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__autoconf}