SPECS: apcupsd.spec - bcond fix, cosmetics, R: rc-scripts

[qboosh]

Author: qboosh                       Date: Tue Dec  6 17:39:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond fix, cosmetics, R: rc-scripts

---- Files affected:
SPECS:
   apcupsd.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/apcupsd.spec
diff -u SPECS/apcupsd.spec:1.61 SPECS/apcupsd.spec:1.62
--- SPECS/apcupsd.spec:1.61	Sun Dec  4 23:58:06 2005
+++ SPECS/apcupsd.spec	Tue Dec  6 18:38:58 2005
@@ -22,7 +22,8 @@
 URL:		http://www.apcupsd.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_snmp:BuildRequires: net-snmp-devel}
+%{?with_snmp:BuildRequires:	net-snmp-devel}
+Requires:	rc-scripts
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,13 +52,13 @@
 cd autoconf
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
-cp -f ./configure ..
+cp -f configure ..
 cd ..
 %configure \
 	--with-log-dir=%{_var}/log \
 	--with-stat-dir=%{_var}/lib/apcupsd \
 	%{?with_test:--enable-test} \
-%if %{?with_net}
+%if %{with net}
 	--enable-net \
 	--enable-master-slave \
 %endif
@@ -102,13 +103,12 @@
 	if [ -f /var/lock/subsys/apcupsd ]; then
 		/etc/rc.d/init.d/apcupsd stop >&2
 	fi
-/sbin/chkconfig --del apcupsd
+	/sbin/chkconfig --del apcupsd
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog Developers doc/{README.apcaccess,README.solaris}
-%{_mandir}/man8/apcupsd.*
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apcupsd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apcupsd
@@ -127,6 +127,7 @@
 %dir /var/lib/apcupsd
 %attr(640,root,root) %ghost /var/log/apcupsd.events
 %attr(640,root,root) %ghost /var/lib/apcupsd/apcupsd.status
+%{_mandir}/man8/apcupsd.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -134,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2005/12/06 17:38:58  qboosh
+- bcond fix, cosmetics, R: rc-scripts
+
 Revision 1.61  2005/12/04 22:58:06  glen
 - adapterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apcupsd.spec?r1=1.61&r2=1.62&f=u