rpms/apcupsd/devel apcupsd.spec,1.25,1.26

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11166

Modified Files:
	apcupsd.spec 
Log Message:
move cgi configuration to cgi package


Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apcupsd.spec	28 May 2008 08:53:42 -0000	1.25
+++ apcupsd.spec	28 May 2008 12:15:55 -0000	1.26
@@ -16,7 +16,7 @@
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
 BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel
-BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, autoconf
+BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 Requires:      /bin/mail
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -82,8 +82,7 @@
         --with-upstype=usb \
         --with-upscable=usb \
         APCUPSD_MAIL=/bin/mail
-make
-
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,8 +125,6 @@
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
-%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf
-%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
 %config(noreplace) %{_sysconfdir}/apcupsd/changeme
 %config(noreplace) %{_sysconfdir}/apcupsd/commfailure
@@ -143,6 +140,8 @@
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
+%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf
+%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf
 %{_localstatedir}/www/apcupsd/
 
 %files gui
@@ -173,6 +172,9 @@
 
 
 %changelog
+* Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com>
+- fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi
+
 * Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-1
 - new upstream version