rpms/nut/devel nut.spec,1.61,1.62
Tomas Smetana
tsmetana at fedoraproject.org
Tue Aug 26 07:24:23 UTC 2008
- Previous message (by thread): rpms/ann/devel ann-gcc43.patch, NONE, 1.1 ann-make.patch, NONE, 1.1 ann.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/wallpapoz/devel wallpapoz.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20638
Modified Files:
nut.spec
Log Message:
* Mon Aug 25 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-2
- fix requirements in spec file
- build a separate hal package
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nut.spec 19 May 2008 12:34:38 -0000 1.61
+++ nut.spec 26 Aug 2008 07:23:53 -0000 1.62
@@ -9,7 +9,7 @@
Summary: Network UPS Tools
Name: nut
Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,8 +64,9 @@
%package client
Group: Applications/System
Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(pre): /usr/sbin/useradd
%description client
This package includes the client utilities that are required to monitor a
@@ -76,6 +77,7 @@
Group: Applications/System
Summary: CGI utilities for the Network UPS Tools
Requires: %{name}-client = %{version}-%{release} webserver
+Requires(pre): /usr/sbin/useradd
%description cgi
This package includes CGI programs for accessing UPS status via a web
@@ -90,6 +92,17 @@
This package adds the netxml-ups driver, that allows NUT to monitor a XML
capable UPS.
+%package hal
+Summary: UPS Monitoring Software
+Group: Hardware/UPS
+Requires: hal
+Conflicts: apcupsd, %{name}
+
+%description hal
+This package contains the HAL enabled version of the drivers. You can use
+this for most USB connected UPSes that are powering a single system with a
+graphical desktop.
+
%package devel
Group: Development/Libraries
Summary: Development files for NUT Client
@@ -104,7 +117,7 @@
%patch0 -p1 -b .conf
%patch1 -p1 -b .multilib
%patch2 -p1 -b .udevusb
-%patch3 -p1 -b .open
+#%patch3 -p1 -b .open
%patch4 -p1 -b .usbhal
%patch5 -p1 -b .halpath
@@ -201,6 +214,7 @@
if [ "$1" -ge "1" ]; then
/sbin/service ups condrestart > /dev/null 2>&1
fi
+/sbin/ldconfig
exit 0
%clean
@@ -213,15 +227,12 @@
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
-%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
%{modeldir}/*
%exclude %{modeldir}/netxml-ups
%{_sbindir}/upsd
%{_bindir}/upslog
%{_datadir}/cmdvartab
%{_datadir}/driver.list
-%{_libexecdir}/hald-addon*
-%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
%{_mandir}/man5/ups.conf.5.gz
%{_mandir}/man5/upsd.conf.5.gz
%{_mandir}/man5/upsd.users.5.gz
@@ -313,6 +324,13 @@
%{modeldir}/netxml-ups
%doc %{_mandir}/man8/netxml-ups.8.gz
+%files hal
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README UPGRADING docs/nut-hal.txt
+%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
+%{_libexecdir}/hald-addon*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
@@ -321,8 +339,9 @@
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
-* Mon May 19 2008 Tomas Smetana <tsmetana at redhat.com>
+* Mon Aug 25 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-2
- fix requirements in spec file
+- build a separate hal package
* Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-1
- new upstream version
- Previous message (by thread): rpms/ann/devel ann-gcc43.patch, NONE, 1.1 ann-make.patch, NONE, 1.1 ann.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/wallpapoz/devel wallpapoz.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list