dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ipmitool
-# $Id$
-NAME := ipmitool
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-ipmitool-1_8_10-2_fc9:HEAD:ipmitool-1.8.10-2.fc9.src.rpm:1224239134

ipmitool-1.8.10-ipmievd-condrestart.patch

@@ -0,0 +1,39 @@
+532188 -  ipmievd init script's condrestart doesn't work
+
+Author: Ville Skyttä (ville.skytta@iki.fi)
+Sent upstream as https://sourceforge.net/tracker/?func=detail&aid=2889888&group_id=95200&atid=610552
+
+Index: contrib/ipmievd.init.redhat
+===================================================================
+RCS file: /cvsroot/ipmitool/ipmitool/contrib/ipmievd.init.redhat,v
+retrieving revision 1.1
+diff -u -r1.1 ipmievd.init.redhat
+--- contrib/ipmievd.init.redhat	19 Mar 2006 23:05:48 -0000	1.1
++++ contrib/ipmievd.init.redhat	31 Oct 2009 08:50:07 -0000
+@@ -62,6 +62,11 @@
+ 	return $ret
+ }
+ 
++restart() {
++	stop
++	start
++}
++
+ case "$1" in
+     start)
+ 	start
+@@ -72,11 +77,10 @@
+     status)
+ 	status $IPMIEVD_BIN
+ 	;;
+-    restart|reload)
+-    	stop
+-	start
++    restart|reload|force-reload)
++	restart
+ 	;;
+-    condrestart)
++    try-restart|condrestart)
+ 	[ -f /var/lock/subsys/ipmievd ] && restart || :
+ 	;;
+     *)

ipmitool.spec

@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.11
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -15,6 +15,7 @@ Obsoletes: OpenIPMI-tools < 2.0.14-3
 Provides: OpenIPMI-tools = 2.0.14-3
 
 Patch1: ipmitool-1.8.10-ipmievd-init.patch
+Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch
 
 %description
 This package contains a utility for interfacing with devices that support
@@ -35,6 +36,7 @@ setting LAN configuration, and chassis power control.
 
 %setup -q
 %patch1 -p1 -b .ipmievd-init
+%patch2 -p0 -b .condrestart
 
 for f in AUTHORS ChangeLog; do
     iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
@@ -85,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Nov  2 2009 Jan Safranek  <jsafrane@redhat.com> 1.8.11-4
+- fix ipmievd initscript 'condrestart' action (#532188)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.8.11-3
 - rebuilt with new openssl