From 1e1f848ca3e078d3eebd709ea28f2bc3931f1942 Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Jul 18 2007 17:19:37 +0000 Subject: updating to last RHEL-5 version --- diff --git a/edac-utils.spec b/edac-utils.spec index 903c8ae..58aaf9b 100644 --- a/edac-utils.spec +++ b/edac-utils.spec @@ -1,6 +1,6 @@ Name: edac-utils Version: 0.9 -Release: 3%{?dist} +Release: 6%{?dist} Summary: Userspace helper for kernel EDAC drivers Group: System Environment/Base @@ -9,6 +9,7 @@ URL: http://sourceforge.net/projects/edac-utils/ Source0: http://dl.sourceforge.net/sourceforge/edac-utils/%{name}-%{version}.tar.bz2 Patch0: edac_ctl-remove_driver_loading.patch Patch1: edac_init-fix_messages.patch +Patch2: edac_ctl-fix_model_parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Requires: hwdata, dmidecode, sysfsutils @@ -36,6 +37,7 @@ for %{name}. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --disable-static @@ -81,6 +83,17 @@ fi %{_includedir}/edac.h %changelog +* Tue Jul 17 2007 Aristeu Rozanski 0.9-6 +- building FC7 package + +* Thu Jul 09 2007 Aristeu Rozanski 0.9-5 +- Fixed start/stop message, missing echo +- Fixed status command to use edac-util + +* Thu Jun 15 2007 Aristeu Rozanski 0.9-4 +- Removed debug code left by mistake on initrd file +- Fixed model comparing in edac-ctl script + * Wed Jun 13 2007 Aristeu Rozanski 0.9-3 - Adding COPYING to documents - Fixing Requires to use a single equal sign, instead of two diff --git a/edac_init-fix_messages.patch b/edac_init-fix_messages.patch index 7daa537..35bc035 100644 --- a/edac_init-fix_messages.patch +++ b/edac_init-fix_messages.patch @@ -2,7 +2,7 @@ Index: edac-utils-0.9/src/etc/edac.init =================================================================== --- edac-utils-0.9.orig/src/etc/edac.init +++ edac-utils-0.9/src/etc/edac.init -@@ -7,48 +7,57 @@ +@@ -7,21 +7,31 @@ # Written by Mark Grondona # UCRL-CODE-230739. ############################################################################### @@ -31,14 +31,13 @@ Index: edac-utils-0.9/src/etc/edac.init +SERVICE="edac" PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin EDAC=/usr/sbin/edac-ctl ++EDAC_UTIL=/usr/bin/edac-util +LOGGER="logger -t $SERVICE -p info" +SUBSYS=/var/lock/subsys/edac ############################################################################### -+set >/tmp/lala - service_start () - { +@@ -30,25 +40,26 @@ service_start () # Start the service. Required by LSB. # echo -n "Starting ${SERVICE}: " @@ -59,6 +58,7 @@ Index: edac-utils-0.9/src/etc/edac.init + else + daemon false; + fi ++ echo; } ############################################################################### @@ -72,10 +72,20 @@ Index: edac-utils-0.9/src/etc/edac.init rc=$? - [ $rc -eq 0 ] && echo success || echo failure + rm -f $SUBSYS; ++ echo; } ############################################################################### -@@ -75,9 +84,15 @@ case "$1" in +@@ -57,7 +68,7 @@ service_status () + { + # Print the current status of the service. Required by LSB. + # +- $EDAC --status ++ $EDAC_UTIL --status + rc=0 + } + +@@ -75,9 +86,15 @@ case "$1" in status) service_status ;;