SPECS: nut.spec - upsmon (nut-client) needs ups user! - ups usera ...

[zawadaa]

Author: zawadaa                      Date: Tue Oct 25 21:17:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- upsmon (nut-client) needs ups user! - ups usera moved to nut-common
- STBR?

---- Files affected:
SPECS:
   nut.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.96 SPECS/nut.spec:1.97
--- SPECS/nut.spec:1.96	Tue Sep 13 12:55:09 2005
+++ SPECS/nut.spec	Tue Oct 25 23:17:00 2005
@@ -7,7 +7,7 @@
 Summary(pl):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.0.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://eu1.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
@@ -27,17 +27,8 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	rpmbuild(macros) >= 1.202
 Requires:	rc-scripts
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/groupmod
-Requires(pre):	/usr/sbin/useradd
 Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Requires:	%{name}-common = %{version}-%{release}
-Provides:	group(ups)
-Provides:	user(ups)
 Obsoletes:	smartupstools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,6 +65,15 @@
 Summary:	Package with common files for nut daemon and its clients
 Summary(pl):	Pakiet z plikami wspólnymi dla demona nut i jego klientów
 Group:		Applications/System
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/groupmod
+Requires(pre):	/usr/sbin/useradd
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Provides:	group(ups)
+Provides:	user(ups)
 
 %description common
 Package with common files for nut daemon and its clients.
@@ -208,7 +208,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pre common
 # move to trigger?
 if [ -n "`/usr/bin/getgid ups`" ] && [ "`/usr/bin/getgid ups`" = 121 ]; then
 	/usr/sbin/groupmod -g 76 ups
@@ -250,7 +250,7 @@
 	/sbin/chkconfig --del upsmon
 fi
 
-%postun
+%postun common
 if [ "$1" = "0" ]; then
 	%userremove ups
 	%groupremove ups
@@ -295,8 +295,8 @@
 %attr(755,root,root) %{_sbindir}/upssched
 %attr(755,root,root) %{_sbindir}/upssched-cmd
 %attr(754,root,root) /etc/rc.d/init.d/upsmon
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsmon.conf
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upssched.conf
+%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsmon.conf
+%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upssched.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/upsmon
 %{_mandir}/man5/upsmon.conf.5*
 %{_mandir}/man5/upssched.conf.5*
@@ -329,6 +329,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2005/10/25 21:17:00  zawadaa
+- upsmon (nut-client) needs ups user! - ups usera moved to nut-common
+- STBR?
+
 Revision 1.96  2005/09/13 10:55:09  zawadaa
 - up to 2.0.2
 - PreReq -> Req rc-scripts
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.96&r2=1.97&f=u