- up to 20130601 snap

diff --git a/bashism.patch b/bashism.patch
index 18041824f463e1da6fd81f760e3e7d42a899a0c4..1ae915987589503cb9719ce2f5ff6bff18fb00a2 100644 (file)
--- a/bashism.patch
+++ b/bashism.patch
@@ -1,17 +1,18 @@
---- mcelog-1.0pre3/triggers/cache-error-trigger~       2010-01-21 04:36:52.000000000 +0200
-+++ mcelog-1.0pre3/triggers/cache-error-trigger        2010-08-10 13:40:29.531631113 +0300
+diff -urN mcelog-master.org/triggers/cache-error-trigger mcelog-master/triggers/cache-error-trigger
+--- mcelog-master.org/triggers/cache-error-trigger     2013-05-03 01:03:26.000000000 +0200
++++ mcelog-master/triggers/cache-error-trigger 2013-06-01 11:06:34.399817944 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  # cache error trigger. This shell script is executed by mcelog in daemon mode
  # when a CPU reports excessive corrected cache errors. This could be a indication
  # for future uncorrected errors.
-@@ -25,7 +25,7 @@
+@@ -28,7 +28,7 @@
        logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold"
        F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i)
        echo 0 > $F
--      if [ "$(< $F)" != "0" ] then
-+      if [ "$(cat $F)" != "0" ] then
+-      if [ "$(< $F)" != "0" ] ; then
++      if [ "$(cat $F)" != "0" ] ; then
                logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed"
+               EXIT=1
        fi
- done

diff --git a/manual.patch b/manual.patch
deleted file mode 100644 (file)
index 103cfe4..0000000
--- a/manual.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mcelog-1.0pre3/mcelog.8    2010-08-10 12:47:10.342360355 +0300
-+++ mcelog-1.0pre3/mcelog.8    2010-08-10 12:48:29.041936982 +0300
-@@ -45,7 +45,7 @@
- Optionally it can also take more options like keeping statistics or
- triggering shell scripts on specific events.
- 
--The normal operating modi for mcelog are running 
-+The normal operating mode for mcelog is running 
- as a regular cron job (traditional way, deprecated), 
- running as a trigger directly executed by the kernel, 
- or running as a daemon with the
-@@ -172,7 +172,7 @@
- .B \-\-config-file file
- option mcelog reads the specified config file.
- Default is 
--.I /etc/mcelog.conf
-+.I /etc/mcelog/mcelog.conf
- See also 
- .I CONFIG FILE
- below.
-@@ -245,7 +245,7 @@
- .SH CONFIG FILE
- mcelog supports a config file to set defaults. Command line options override
- the config file. By default the config file is read from
--.I /etc/mcelog.conf
-+.I /etc/mcelog/mcelog.conf
- unless overridden with the 
- .I --config-file
- option.

diff --git a/mcelog.spec b/mcelog.spec
index 49c26f7a0b9142208a42ab50983b379004d2d547..f6d54ded90c2df6445aa6d1e65493f783aa72412 100644 (file)
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,25 +1,25 @@
 # TODO
 # - sync pl
-%define                subver  pre3
-%define                rel     4
+%define                snap    20130601
+%define                rel     1
 Summary:       x86-64/x86 Machine Check Exceptions collector and decoder
 Summary(pl.UTF-8):     Narzędzie do zbierania i dekodowania wyjątków MCE na platformie x86-64/x86
 Name:          mcelog
 Version:       1.0
-Release:       0.%{subver}.%{rel}
+Release:       0.%{snap}.%{rel}
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://www.kernel.org/pub/linux/utils/cpu/mce/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: b42f2214de6f4feb992556149edc67fa
+Source0:       https://github.com/andikleen/mcelog/archive/master.zip
+# Source0-md5: 81f744e778cd170f68d03764633c4a31
 Source1:       %{name}.logrotate
 Source2:       %{name}.cron
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Patch1:                %{name}-FHS.patch
-Patch2:                manual.patch
-Patch3:                bashism.patch
-URL:           http://www.mcelog.org/
+Patch2:                bashism.patch
+URL:           https://github.com/andikleen/mcelog.git
 BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: unzip
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 Suggests:      crondaemon
@@ -60,10 +60,9 @@ który może być czytany z przestrzeni użytkownika poprzez urządzenie
 tych zdarzeń; loguje ono zdekodowane zdarzenia MCE do /var/log/mcelog.
 
 %prep
-%setup -q -n %{name}-%{version}%{subver}
+%setup -q -n %{name}-master
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__make} \