diff --git a/nut.changes b/nut.changes index 1cf43ba..18a1afc 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 23 17:46:28 CEST 2007 - sbrabec@suse.cz + +- Renamed web pages to prevent conflicts. + ------------------------------------------------------------------- Mon Oct 22 17:39:41 CEST 2007 - sbrabec@suse.cz diff --git a/nut.spec b/nut.spec index be10305..f59c3f0 100644 --- a/nut.spec +++ b/nut.spec @@ -22,7 +22,7 @@ Conflicts: apcupsd AutoReqProv: on Summary: UPS Monitoring Software Version: 2.2.0 -Release: 28 +Release: 30 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -184,6 +184,11 @@ rename .sample "" $RPM_BUILD_ROOT%{_sysconfdir}/ups/*.sample mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services cp nut.firewall $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %endif +# 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 %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ @@ -282,6 +287,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %doc %{_mandir}/man3/*.* %changelog +* Tue Oct 23 2007 - sbrabec@suse.cz +- Renamed web pages to prevent conflicts. * Mon Oct 22 2007 - sbrabec@suse.cz - Fixed udev USB rules for current kernels (#331749). - Added SuSEfirewall2 rule and fixed documentation (#335466).