Hello community, here is the log from the commit of package nut checked in at Tue Jun 3 01:06:35 CEST 2008. -------- --- nut/nut.changes 2008-05-26 15:10:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/nut/nut.changes 2008-05-28 18:09:57.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 28 15:56:12 CEST 2008 - sbrabec@suse.cz + +- nut-cgi: Fixed and documented URLs (bnc#354388#c10). +- README.SUSE: Fixed name of the most common USB HID driver. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.s24234/_old 2008-06-03 01:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.s24234/_new 2008-06-03 01:06:24.000000000 +0200 @@ -21,7 +21,7 @@ Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.2.2 -Release: 7 +Release: 9 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -367,6 +367,8 @@ %description cgi Web server support package for the Network UPS Tools. +Predefined URL is http://localhost/nut/index.html + Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. @@ -518,10 +520,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d install nut.sleep $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d/80nut # Rename web pages to not conflict with apache2-example-pages or user home page: -mv $RPM_BUILD_ROOT%{HTMLPATH}/index.html $RPM_BUILD_ROOT%{HTMLPATH}/ups.html -mv $RPM_BUILD_ROOT%{HTMLPATH}/header.html $RPM_BUILD_ROOT%{HTMLPATH}/ups_header.html -mv $RPM_BUILD_ROOT%{HTMLPATH}/bottom.html $RPM_BUILD_ROOT%{HTMLPATH}/ups_bottom.html -sed -i 's/\(header\|bottom\)/ups_&/g' $RPM_BUILD_ROOT%{HTMLPATH}/ups.html +mkdir $RPM_BUILD_ROOT%{HTMLPATH}/nut $RPM_BUILD_ROOT%{CGIPATH}/nut +mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/ +mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ @@ -637,9 +638,8 @@ %files cgi %defattr(-,root,root) -%{CGIPATH}/*.cgi -%{HTMLPATH}/*.html -%{HTMLPATH}/*.png +%{CGIPATH}/nut +%{HTMLPATH}/nut %config(noreplace) %{CONFPATH}/upsstats-single.html %config(noreplace) %{CONFPATH}/upsstats.html @@ -657,6 +657,9 @@ %doc %{_mandir}/man3/*.* %changelog +* Wed May 28 2008 sbrabec@suse.cz +- nut-cgi: Fixed and documented URLs (bnc#354388#c10). +- README.SUSE: Fixed name of the most common USB HID driver. * Mon May 26 2008 sbrabec@suse.cz - Provide and Require nut-package (bnc#337059#c3). * Fri May 09 2008 sbrabec@suse.cz ++++++ README.SUSE ++++++ --- nut/README.SUSE 2008-05-06 15:32:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/nut/README.SUSE 2008-05-28 18:01:43.000000000 +0200 @@ -20,7 +20,7 @@ want to manage shutdown of more computers sharing the same UPS). - nut-cgi provides support for monitoring UPS web pages using apache web - browser. + browser. Predefined address is http://localhost/nut/index.html nut-hal Configuration @@ -54,7 +54,7 @@ - Go to the [myups] section at the end of the file. - Set driver key to the driver name supporting your UPS. (see /usr/lib/ups/driver/ for possible drivers. Each driver - has a man page. Many USB UPSes are hidups.) + has a man page. Many USB UPSes are usbhid-ups.) - Set port key to the device your UPS is connected to, e.g. /dev/ttyS0 for first serial port (COM1) or /dev/hiddev0 for USB HID UPS. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org