packages: mcelog/mcelog-FHS.patch, mcelog/mcelog.logrotate, mcelog/mcelog.s...

[gotar]

Author: gotar                        Date: Mon Feb  1 21:44:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 1.0pre3

---- Files affected:
packages/mcelog:
   mcelog-FHS.patch (1.2 -> 1.3) , mcelog.logrotate (1.1 -> 1.2) , mcelog.spec (1.12 -> 1.13) , mcelog-DESTDIR.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mcelog/mcelog-FHS.patch
diff -u packages/mcelog/mcelog-FHS.patch:1.2 packages/mcelog/mcelog-FHS.patch:1.3
--- packages/mcelog/mcelog-FHS.patch:1.2	Mon Apr  6 11:59:30 2009
+++ packages/mcelog/mcelog-FHS.patch	Mon Feb  1 22:44:18 2010
@@ -1,11 +1,11 @@
---- mcelog-0.8pre/mcelog.c~	2007-01-09 13:57:26.000000000 +0200
-+++ mcelog-0.8pre/mcelog.c	2008-10-08 19:16:07.114831791 +0300
-@@ -37,7 +37,7 @@
- enum cputype cpu = CPU_GENERIC;	
+--- mcelog-1.0pre3/paths.h.orig	2010-01-21 03:36:52.000000000 +0100
++++ mcelog-1.0pre3/paths.h	2010-02-01 22:38:22.000000000 +0100
+@@ -1,7 +1,7 @@
+ #define PREFIX ""
  
- char *logfn = "/dev/mcelog";
--char *dimm_db_fn = "/var/lib/memory-errors"; 
-+char *dimm_db_fn = "/var/lib/misc/memory-errors"; 
+ #define LOG_DEV_FILENAME "/dev/mcelog"
+-#define DIMM_DB_FILENAME PREFIX "/var/lib/memory-errors"
++#define DIMM_DB_FILENAME PREFIX "/var/lib/misc/memory-errors"
+ #define CONFIG_FILENAME PREFIX "/etc/mcelog/mcelog.conf"
  
- int use_syslog;
- int do_dmi;
+ #define SOCKET_PATH "/var/run/mcelog-client"

================================================================
Index: packages/mcelog/mcelog.logrotate
diff -u packages/mcelog/mcelog.logrotate:1.1 packages/mcelog/mcelog.logrotate:1.2
--- packages/mcelog/mcelog.logrotate:1.1	Mon May  8 14:27:37 2006
+++ packages/mcelog/mcelog.logrotate	Mon Feb  1 22:44:18 2010
@@ -9,4 +9,3 @@
 		chmod 644 /var/log/mcelog
     endscript
 }
-

================================================================
Index: packages/mcelog/mcelog.spec
diff -u packages/mcelog/mcelog.spec:1.12 packages/mcelog/mcelog.spec:1.13
--- packages/mcelog/mcelog.spec:1.12	Tue Jun 16 15:32:52 2009
+++ packages/mcelog/mcelog.spec	Mon Feb  1 22:44:18 2010
@@ -1,17 +1,15 @@
 # $Revision$, $Date$
-%define		subver	pre
-%define		rel		4
+%define		subver	pre3
 Summary:	x86-64 Machine Check Exceptions collector and decoder
 Summary(pl.UTF-8):	Narzędzie do zbierania i dekodowania wyjątków MCE na platformie x86-64
 Name:		mcelog
-Version:	0.8
-Release:	0.%{subver}.%{rel}
+Version:	1.0
+Release:	0.%{subver}
 License:	GPL v2
 Group:		Applications/System
-Source0:	ftp://ftp.x86-64.org/pub/linux/tools/mcelog/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5:	97fba9e248f23f12d562b92e90ed77fc
+Source0:	http://www.kernel.org/pub/linux/utils/cpu/mce/%{name}-%{version}%{subver}.tar.gz
+# Source0-md5:	b42f2214de6f4feb992556149edc67fa
 Source1:	%{name}.logrotate
-Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-FHS.patch
 Requires:	crondaemon
 Requires:	logrotate
@@ -50,7 +48,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{subver}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -60,26 +57,30 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,/etc/{logrotate.d,cron.d},/var/log}
+install -d $RPM_BUILD_ROOT{/etc/{cron,logrotate}.d,/var/log,%{statdir}}
+
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	prefix=$RPM_BUILD_ROOT/%{_prefix} \
+	etcprefix=$RPM_BUILD_ROOT
+
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/cron.d/%{name}
 0 * * * * root %{_sbindir}/mcelog --ignorenodev --filter >> /var/log/mcelog
 EOF
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
-install -d $RPM_BUILD_ROOT%{statdir}
-touch $RPM_BUILD_ROOT%{statdir}/memory-errors
+:> $RPM_BUILD_ROOT%{statdir}/memory-errors
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README TODO
+%doc CHANGES README TODO TODO-diskdb mce.pdf
 %attr(755,root,root) %{_sbindir}/mcelog
 %attr(640,root,root) /etc/cron.d/mcelog
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mcelog
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}
 %attr(640,root,root) %ghost %{statdir}/memory-errors
 %{_mandir}/man8/mcelog.8*
 
@@ -89,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/02/01 21:44:18  gotar
+- upgraded to 1.0pre3
+
 Revision 1.12  2009/06/16 13:32:52  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mcelog/mcelog-FHS.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mcelog/mcelog.logrotate?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mcelog/mcelog.spec?r1=1.12&r2=1.13&f=u