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

[Tomas Smetana (tsmetana)]

Author: tsmetana

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

Modified Files:
	apcupsd.spec 
Log Message:
update changelog


Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- apcupsd.spec	28 May 2008 12:15:55 -0000	1.26
+++ apcupsd.spec	6 Jun 2008 09:52:12 -0000	1.27
@@ -1,21 +1,20 @@
 Name:         apcupsd
 Version:      3.14.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
-License:      GPL
+License:      GPLv2
 URL:          http://www.apcupsd.com
 Source0:      http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
 Source1:      apcupsd.logrotate
 Source2:      apcupsd-httpd.conf
 Patch0:       apcupsd-3.14.3-init.patch
 Patch1:       apcupsd-3.14.4-shutdown.patch
-Patch2:       apcupsd-3.14.1-cloexec.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
-BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel
+BuildRequires: net-snmp-devel, tcp_wrappers-devel
 BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 Requires:      /bin/mail
 Requires(post):  /sbin/chkconfig
@@ -58,13 +57,13 @@
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .shutdown
-%patch2 -p1 -b .cloexec
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
 %configure \
         --sysconfdir="%{_sysconfdir}/apcupsd" \
         --with-cgi-bin="%{_localstatedir}/www/apcupsd" \
+        --sbindir=/sbin \
         --enable-cgi \
         --enable-pthreads \
         --enable-net \
@@ -133,7 +132,7 @@
 %config(noreplace) %{_sysconfdir}/apcupsd/onbattery
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
 %{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi
-%attr(0755,root,root) %{_sbindir}/*
+%attr(0755,root,root) /sbin/*
 %{_mandir}/*/*
 
 %files cgi
@@ -172,8 +171,10 @@
 
 
 %changelog
-* Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com>
+* Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-2
+- drop useless build requirements
 - fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi
+- move binaries to /sbin (related #346271)
 
 * Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-1
 - new upstream version