- don't require redhat-lsb (#252343)

iprutils-lsb-init-ectomy.patch

@@ -0,0 +1,189 @@
+diff -up iprutils/init.d/iprdump.lsb iprutils/init.d/iprdump
+--- iprutils/init.d/iprdump.lsb	2007-10-01 14:07:33.000000000 -0400
++++ iprutils/init.d/iprdump	2007-10-01 14:12:04.000000000 -0400
+@@ -23,20 +23,20 @@
+ 
+ IPRDUMP=/sbin/iprdump
+ test -x $IPRDUMP || exit 5
+-. /lib/lsb/init-functions
++. /etc/init.d/functions
+ 
+ start() {
+     echo -n "Starting ipr dump daemon"
+     if [ ! -d /sys/class/scsi_generic ] ; then
+         modprobe sg
+     fi
+-    start_daemon $IPRDUMP
++    daemon $IPRDUMP
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -47,9 +47,9 @@ stop() {
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -73,9 +73,9 @@ status() {
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
++	success "running"
+     else
+-	log_failure_msg "unused"
++	failure "unused"
+     fi
+     return $RETVAL
+ }
+diff -up iprutils/init.d/iprha.lsb iprutils/init.d/iprha
+--- iprutils/init.d/iprha.lsb	2007-10-01 14:07:37.000000000 -0400
++++ iprutils/init.d/iprha	2007-10-01 14:12:17.000000000 -0400
+@@ -25,7 +25,7 @@
+ 
+ IPRCONFIG=/sbin/iprconfig
+ test -x $IPRCONFIG || exit 5
+-. /lib/lsb/init-functions
++. /etc/init.d/functions
+ 
+ start() {
+     echo -n "Enabling ipr primary adapter mode"
+@@ -33,9 +33,9 @@ start() {
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -46,9 +46,9 @@ stop() {
+     
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+diff -up iprutils/init.d/iprupdate.lsb iprutils/init.d/iprupdate
+--- iprutils/init.d/iprupdate.lsb	2007-10-01 14:07:47.000000000 -0400
++++ iprutils/init.d/iprupdate	2007-10-01 14:11:29.000000000 -0400
+@@ -23,7 +23,7 @@
+ 
+ IPRUPDATE=/sbin/iprupdate
+ test -x $IPRUPDATE || exit 5
+-. /lib/lsb/init-functions
++. /etc/init.d/functions
+ 
+ start() {
+ 	echo "Checking ipr microcode levels"
+@@ -35,10 +35,10 @@ start() {
+ 	RETVAL=$?
+ 	if [ $RETVAL -eq 0 ]; then
+ 	    echo -n "Completed ipr microcode updates"
+-	    log_success_msg " "
++	    success " "
+ 	else
+ 	    echo -n "Completed ipr microcode updates"
+-	    log_failure_msg " "
++	    failure " "
+ 	fi
+         return $RETVAL
+ }
+@@ -49,9 +49,9 @@ stop() {
+     
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -75,9 +75,9 @@ status() {
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
++	success "running"
+     else
+-	log_failure_msg "unused"
++	failure "unused"
+     fi
+     return $RETVAL
+ }
+diff -up iprutils/init.d/iprinit.lsb iprutils/init.d/iprinit
+--- iprutils/init.d/iprinit.lsb	2007-10-01 14:07:43.000000000 -0400
++++ iprutils/init.d/iprinit	2007-10-01 14:13:05.000000000 -0400
+@@ -23,20 +23,20 @@
+ 
+ IPRINIT=/sbin/iprinit
+ test -x $IPRINIT || exit 5
+-. /lib/lsb/init-functions
++. /etc/init.d/functions
+ 
+ start() {
+     echo -n "Starting ipr initialization daemon"
+     if [ ! -d /sys/class/scsi_generic ] ; then
+         modprobe sg
+     fi
+-    start_daemon $IPRINIT --daemon
++    daemon $IPRINIT --daemon
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -47,9 +47,9 @@ stop() {
+     
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
++	success " "
+     else
+-	log_failure_msg " "
++	failure " "
+     fi
+     return $RETVAL
+ }
+@@ -73,9 +73,9 @@ status() {
+ 
+     RETVAL=$?
+     if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
++	success "running"
+     else
+-	log_failure_msg "unused"
++	failure "unused"
+     fi
+     return $RETVAL
+ }

iprutils.spec

@@ -2,11 +2,12 @@ ExclusiveArch: ppc ppc64
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
 Patch0: iprutils-cflags.patch
+Patch1: iprutils-lsb-init-ectomy.patch
 URL: http://sourceforge.net/projects/iprdd/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Obsoletes: ipr-utils
@@ -14,7 +15,6 @@ BuildRequires: libsysfs-devel
 BuildRequires: pciutils-devel
 BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
-Requires: redhat-lsb
 
 %description
 Provides a suite of utilities to manage and configure SCSI devices
@@ -23,6 +23,7 @@ supported by the ipr SCSI storage device driver.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS=$RPM_OPT_FLAGS make
@@ -56,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Oct  1 2007 Jeremy Katz <katzj@redhat.com> - 2.2.6-3
+- don't require redhat-lsb (#252343)
+
 * Tue Aug 21 2007 David Cantrell <dcantrell@redhat.com> - 2.2.6-2
 - Rebuild