diff --git a/edac-utils.spec b/edac-utils.spec index 4879131..62f28a5 100644 --- a/edac-utils.spec +++ b/edac-utils.spec @@ -1,6 +1,6 @@ Name: edac-utils -Version: 0.9 -Release: 14%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: Userspace helper for kernel EDAC drivers Group: System Environment/Base @@ -8,9 +8,6 @@ License: GPLv2+ URL: http://sourceforge.net/projects/edac-utils/ Source0: http://dl.sourceforge.net/sourceforge/edac-utils/%{name}-%{version}.tar.bz2 Source1: edac.service -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 @@ -39,9 +36,6 @@ for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --disable-static @@ -61,19 +55,12 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -#if [ $1 = 1 ]; then -# /sbin/chkconfig --add edac -#fi if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %preun -#if [ $1 = 0 ]; then -# /sbin/service edac stop >/dev/null 2>&1 || : -# /sbin/chkconfig --del edac -#fi if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable edac.service > /dev/null 2>&1 || : @@ -115,6 +102,9 @@ fi %{_includedir}/edac.h %changelog +* Wed May 02 2012 Aristeu Rozanski - 0.16-1 +- New upstream release 0.16 + * Wed Mar 14 2012 Jon Ciesla - 0.9-14 - Migrate to systemd, BZ 767784. diff --git a/edac_ctl-fix_model_parsing.patch b/edac_ctl-fix_model_parsing.patch deleted file mode 100644 index ebd8333..0000000 --- a/edac_ctl-fix_model_parsing.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: edac-utils-0.9/src/util/edac-ctl -=================================================================== ---- edac-utils-0.9.orig/src/util/edac-ctl -+++ edac-utils-0.9/src/util/edac-ctl -@@ -271,7 +271,7 @@ sub parse_dimm_labels - } - if (/(model|board)\s*:\s*(.*)$/i) { - !$vendor && die "$file: line $line: MB model without vendor\n"; -- @models = split(/[, ]+/, $2); -+ @models = split(/,[\ ]*/, lc $2); - next; - } - diff --git a/edac_ctl-remove_driver_loading.patch b/edac_ctl-remove_driver_loading.patch deleted file mode 100644 index ae129d0..0000000 --- a/edac_ctl-remove_driver_loading.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: edac-utils-0.9/src/util/edac-ctl -=================================================================== ---- edac-utils-0.9.orig/src/util/edac-ctl -+++ edac-utils-0.9/src/util/edac-ctl -@@ -78,27 +78,6 @@ if ( $conf{opt}{mainboard} || $conf{opt - - } - --if ( $conf{opt}{load} || $conf{opt}{unload} || $conf{opt}{status} -- || $conf{opt}{driver} ) { -- if (!($conf{driver} = find_edac_driver ())) { -- print STDERR "No EDAC support for this hardware.\n"; -- } -- -- $conf{opt}{driver} && print "$conf{driver}_edac\n"; -- $conf{opt}{status} && ($status = print_status ()); -- -- if ($conf{opt}{load}) { -- run_cmd ("$modprobe -a $conf{driver}_edac"); -- my $rc = ($? >> 8); exit ($rc); -- } elsif ($conf{opt}{unload}) { -- run_cmd ("$modprobe -r $conf{driver}_edac"); -- exit ($? >> 8); -- } elsif ($conf{opt}{status}) { -- exit ($status ? 0 : 1); -- } --} -- -- - exit (0); - - sub parse_cmdline diff --git a/edac_init-fix_messages.patch b/edac_init-fix_messages.patch deleted file mode 100644 index 35bc035..0000000 --- a/edac_init-fix_messages.patch +++ /dev/null @@ -1,104 +0,0 @@ -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,21 +7,31 @@ - # Written by Mark Grondona - # UCRL-CODE-230739. - ############################################################################### --# chkconfig: 345 40 60 -+# chkconfig: - 40 60 - ############################################################################### - ### BEGIN INIT INFO - # Provides: edac - # Required-Start: $named $time --# Default-Start: 3 5 - # Default-Stop: 0 1 2 6 - # Description: Initialize EDAC drivers for machine hardware -+# Short-Description: Initialize EDAC drivers for machine hardware - ### END INIT INFO - ############################################################################### - --SERVICE="edac" -+if [ -f /etc/init.d/functions ] ; then -+ . /etc/init.d/functions -+elif [ -f /etc/rc.d/init.d/functions ] ; then -+ . /etc/rc.d/init.d/functions -+else -+ exit 0; -+fi - -+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 - - ############################################################################### - -@@ -30,25 +40,26 @@ service_start () - # Start the service. Required by LSB. - # - echo -n "Starting ${SERVICE}: " -- $EDAC --quiet --load -- rc=$? -- $EDAC --register-labels -- case $rc in -- 0) echo success ;; -- 5) echo No EDAC support for this hardware. ;; -- *) echo failure ;; -- esac -- -+ $EDAC --register-labels 2>&1 | $LOGGER; -+ rc=$?; -+ if [ $rc -eq 0 ]; then -+ daemon true; -+ touch $SUBSYS; -+ else -+ daemon false; -+ fi -+ echo; - } - - ############################################################################### - - service_stop () - { -- echo -n "Disabling ${SERVICE}: " -- $EDAC --unload -+ echo -n "Stopping ${SERVICE}: " -+ daemon $EDAC --unload; - rc=$? -- [ $rc -eq 0 ] && echo success || echo failure -+ rm -f $SUBSYS; -+ echo; - } - - ############################################################################### -@@ -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 - ;; -+ restart|reload) -+ service_stop -+ service_start -+ ;; - *) -- COMMANDS="start|stop|status" -+ COMMANDS="start|stop|status|restart|reload" - echo "Usage: $0 {${COMMANDS}}" - exit 1 - ;; - esac -+exit $rc; -+ diff --git a/sources b/sources index 78176ee..d7c4cae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dcad7276c84f9d10b4fb5e036001a75a edac-utils-0.9.tar.bz2 +77dda84f25ddba732da1d94fe357bf87 edac-utils-0.16.tar.bz2