rpms/openhpi-subagent/devel openhpi-subagent-2.3.4-initd.patch, NONE, 1.1 openhpi-subagent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30286

Modified Files:
	.cvsignore sources 
Added Files:
	openhpi-subagent-2.3.4-initd.patch openhpi-subagent.spec 
Log Message:
initial import

openhpi-subagent-2.3.4-initd.patch:

--- NEW FILE openhpi-subagent-2.3.4-initd.patch ---
>From cdcc003151bba6456830cc4f447525c60b3c7cc0 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Thu, 17 Apr 2008 15:55:04 +0200
Subject: [PATCH] update the init.d script to Fedora/Red Hat standards


diff --git a/openhpi-subagent.rc b/openhpi-subagent.rc
index 9485081..7a12f18 100755
--- a/openhpi-subagent.rc
+++ b/openhpi-subagent.rc
@@ -1,5 +1,5 @@
 #! /bin/sh
-# chkconfig: 35 55 55
+# chkconfig: - 55 45
 # description: HPI SNMP Subagent
 # processname: hpiSubagent
 
@@ -9,11 +9,11 @@
 ### BEGIN INIT INFO
 # Provides: hpiSubagent
 # Required-Start: $network net-snmp
-# X-UnitedLinux-Should-Start: network net-snmp
-# Required-Stop:  
-# Default-Start:  3 5
-# Default-Stop:
-# Description:    init script for HPI SNMP Subagent
+# Required-Stop:  $network net-snmp
+# Default-Start:  
+# Default-Stop:   0 1 2 3 4 5 6
+# Short-Description: Start HPI SNMP Subagent at boot time
+# Description:    Enable HPI SNMP Subagent service
 ### END INIT INFO
 
 isUnited=`grep "UnitedLinux" /etc/issue`
@@ -70,6 +70,7 @@ else
 	echo -n $"Starting up HPI SNMP sub-agent daemon: "
 	daemon $prog $OPTIONS  
 	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpi-subagent
 	echo
 	;;
 
@@ -77,6 +78,7 @@ else
 	echo -n $"Shutting down HPI SNMP sub-agent daemon: "
 	killproc $prog 
 	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpi-subagent
 	echo
 	;;
      status) 
@@ -86,8 +88,11 @@ else
      restart|reload)
 	$0 stop && $0 start
 	;;
+     condrestart)
+	[ -f /var/lock/subsys/openhpi-subagent ] && $0 restart || :
+	;;
      *)
-	echo "Usage: $0 {start|stop|status|restart|reload}"
+	echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
 	exit 1
    esac
 
-- 
1.5.4.1



--- NEW FILE openhpi-subagent.spec ---
Name:           openhpi-subagent
Version:        2.3.4
Release:        2%{?dist}
Summary:        NetSNMP subagent for OpenHPI

Group:          System Environment/Base
License:        BSD
URL:            http://www.openhpi.org
Source0:        http://download.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
Patch1:         %{name}-2.3.4-initd.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openhpi-devel >= 2.10, net-snmp-devel, openssl-devel
BuildRequires:  docbook-utils
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service

%description
The openhpi-subagent package contains the Service Availability Forum's
Hardware Platform Interface SNMP sub-agent.

%prep
%setup -q
%patch1 -p1 -b .initd


%build
%configure
make %{?_smp_mflags}
make -C docs subagent-manual/book1.html


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT%{_initrddir}


%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add %{name}

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1
fi
            

%files
%defattr(-,root,root,-)
%doc COPYING README docs/subagent-manual
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/snmp/*.conf
%{_bindir}/hpiSubagent
%{_datadir}/snmp/mibs/*.mib

%changelog
* Fri Apr 25 2008 Dan Horak <dan[at]danny.cz> - 2.3.4-2
- initscript is not a config file
- added missing R(postun)
- update the initd script

* Thu Apr 17 2008 Dan Horak <dan[at]danny.cz> - 2.3.4-1
- initial version 2.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2008 18:53:31 -0000	1.1
+++ .cvsignore	28 Apr 2008 08:24:30 -0000	1.2
@@ -0,0 +1 @@
+openhpi-subagent-2.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2008 18:53:31 -0000	1.1
+++ sources	28 Apr 2008 08:24:30 -0000	1.2
@@ -0,0 +1 @@
+17e84d43ef1d24ae8caa52615efb9512  openhpi-subagent-2.3.4.tar.gz