Author: oden
Date: Thu Feb 8 17:58:51 2007
New Revision: 118111
Added:
packages/cooker/nut/current/SOURCES/nut-2.0.5.tar.gz (contents, props
changed)
packages/cooker/nut/current/SOURCES/nut-2.0.5.tar.gz.sig (contents, props
changed)
Removed:
packages/cooker/nut/current/SOURCES/nut-2.0.4-bouissou2.diff
packages/cooker/nut/current/SOURCES/nut-2.0.4.tar.bz2
Modified:
packages/cooker/nut/current/SPECS/nut.spec
Log:
- 2.0.5
- drop the bouissou2 patch, too difficult to apply
- added the html files
Added: packages/cooker/nut/current/SOURCES/nut-2.0.5.tar.gz
==============================================================================
Binary file. No diff available.
Added: packages/cooker/nut/current/SOURCES/nut-2.0.5.tar.gz.sig
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/nut/current/SPECS/nut.spec
==============================================================================
--- packages/cooker/nut/current/SPECS/nut.spec (original)
+++ packages/cooker/nut/current/SPECS/nut.spec Thu Feb 8 17:58:51 2007
@@ -1,22 +1,23 @@
%define nutuser ups
%define STATEPATH /var/state/ups
%define CGIPATH /var/www/cgi-bin
+%define HTMLPATH /var/www/nut
%define DRVPATH /sbin
%define CONFPATH %{_sysconfdir}/ups
Summary: Network UPS Tools Client Utilities
Name: nut
-Version: 2.0.4
-Release: %mkrel 3
+Version: 2.0.5
+Release: %mkrel 1
Epoch: 1
License: GPL
Group: System/Configuration/Hardware
URL: http://random.networkupstools.org
-Source0:
http://random.networkupstools.org/source/2.0/%{name}-%{version}.tar.bz2
-Source1: upsd
-Source2: upsmon
+Source0:
http://random.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source1:
http://random.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz.sig
+Source2: upsd
+Source3: upsmon
Patch0: nut-2.0.1-lib64.patch
-Patch1: nut-2.0.4-bouissou2.diff
Patch2: nut-2.0.4-upsset.conf.diff
Patch3: nut-2.0.4-mdv_conf.diff
Requires(pre): chkconfig fileutils rpm-helper >= 0.8
@@ -93,10 +94,12 @@
%setup -q
%patch0 -p1 -b .lib64
env WANT_AUTOCONF_2_5=1 autoconf
-%patch1 -p1
%patch2 -p0
%patch3 -p1
+# instead of a patch
+perl -pi -e "s|/cgi-bin/nut|/cgi-bin|g" data/html/*.html*
+
%build
%serverbuild
%configure2_5x \
@@ -104,6 +107,7 @@
--with-statepath=%{STATEPATH} \
--with-drvpath=%{DRVPATH} \
--with-cgipath=%{CGIPATH} \
+ --with-htmlpath=%{HTMLPATH} \
--with-gd-libs \
--with-user=%{nutuser} \
--with-group=%{nutuser} \
@@ -138,8 +142,8 @@
# install SYSV init stuff
install -d %{buildroot}%{_initrddir}
install -d %{buildroot}%{DRVPATH}
-install %SOURCE1 %{buildroot}/%{_initrddir}
install %SOURCE2 %{buildroot}/%{_initrddir}
+install %SOURCE3 %{buildroot}/%{_initrddir}
#install drivers/dummycons %{buildroot}/%{DRVPATH}
# move the *.sample config files to their real locations
@@ -170,6 +174,15 @@
ErrorDocument 403 "Access denied per
%{_sysconfdir}/httpd/conf/webapps.d/%{name}-cgi.conf"
</Files>
+Alias /nut %{HTMLPATH}
+
+<Directory "%{HTMLPATH}">
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.1
+ ErrorDocument 403 "Access denied per
%{_sysconfdir}/httpd/conf/webapps.d/%{name}-cgi.conf"
+</Directory>
+
EOF
%pre
@@ -270,17 +283,21 @@
%{_mandir}/man8/bestfcom.8*
%{_mandir}/man8/metasys.8*
%{_mandir}/man8/mustek.8*
-%{_mandir}/man8/powermust.8*
%{_mandir}/man8/bcmxcp.8*
%{_mandir}/man8/bcmxcp_usb.8*
-%{_mandir}/man8/gamatronic.8*
%{_mandir}/man8/solis.8*
%{_mandir}/man8/tripplite_usb.8*
%{_mandir}/man8/upscode2.8*
+%{_mandir}/man8/al175.8*
+%{_mandir}/man8/dummy-ups.8*
+%{_mandir}/man8/megatec.8*
+%{_mandir}/man8/nitram.8*
+%{_mandir}/man8/optiups.8*
+%{_mandir}/man8/powerpanel.8*
%files
%defattr(-,root,root)
-%doc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING docs
+%doc ChangeLog COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING docs
%attr(0755,root,root) %dir %{CONFPATH}
%attr(0744,root,root) %{_initrddir}/upsmon
%attr(0640,root,ups) %config(noreplace) %{CONFPATH}/upssched.conf
@@ -314,6 +331,11 @@
%{CGIPATH}/upsimage.cgi
%{CGIPATH}/upsset.cgi
%{CGIPATH}/upsstats.cgi
+%dir %attr(0755,root,root) %{HTMLPATH}
+%attr(0644,root,root) %{HTMLPATH}/bottom.html
+%attr(0644,root,root) %{HTMLPATH}/header.html
+%attr(0644,root,root) %{HTMLPATH}/index.html
+%attr(0644,root,root) %{HTMLPATH}/nut-banner.png
%{_mandir}/man5/hosts.conf.5*
%{_mandir}/man5/upsstats.html.5*
%{_mandir}/man5/upsset.conf.5*
