packages (AC-branch): apcupsd/apcupsd.spec - merge with HEAD
glen
glen at pld-linux.org
Mon Feb 8 16:15:43 CET 2010
Author: glen Date: Mon Feb 8 15:15:43 2010 GMT
Module: packages Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
packages/apcupsd:
apcupsd.spec (1.87.2.8 -> 1.87.2.9)
---- Diffs:
================================================================
Index: packages/apcupsd/apcupsd.spec
diff -u packages/apcupsd/apcupsd.spec:1.87.2.8 packages/apcupsd/apcupsd.spec:1.87.2.9
--- packages/apcupsd/apcupsd.spec:1.87.2.8 Mon Feb 8 16:14:52 2010
+++ packages/apcupsd/apcupsd.spec Mon Feb 8 16:15:38 2010
@@ -26,15 +26,15 @@
Patch1: %{name}-pcnet-seconds.patch
URL: http://www.apcupsd.com/
%{?with_gapcmon:BuildRequires: GConf2-devel >= 2.0}
-BuildRequires: SysVinit
BuildRequires: autoconf
-%{?with_cgi:BuildRequires: gd-devel}
-BuildRequires: gettext-devel
+BuildRequires: automake
+BuildRequires: gd-devel
%{?with_gapcmon:BuildRequires: gtk+2-devel >= 2:2.4.0}
-BuildRequires: ncurses-ext-devel
+BuildRequires: man
%{?with_snmp:BuildRequires: net-snmp-devel}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: util-linux
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
@@ -97,6 +97,9 @@
%build
%{__autoconf}
%configure \
+ APCUPSD_MAIL="/bin/mail" \
+ SHUTDOWN="/sbin/shutdown" \
+ WALL="%{_bindir}/wall" \
--with-log-dir=%{_var}/log \
--with-stat-dir=%{_var}/lib/apcupsd \
%if %{with cgi}
@@ -149,7 +152,10 @@
%files
%defattr(644,root,root,755)
%doc ChangeLog Developers
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/apcaccess
+%attr(755,root,root) %{_sbindir}/apctest
+%attr(755,root,root) %{_sbindir}/apcupsd
+%attr(755,root,root) %{_sbindir}/smtp
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apcupsd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apcupsd
%attr(754,root,root) %{_sysconfdir}/apccontrol
@@ -193,6 +199,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87.2.9 2010/02/08 15:15:38 glen
+- merge with HEAD
+
Revision 1.87.2.8 2010/02/08 15:14:52 glen
- fix corrupted charset
@@ -252,7 +261,7 @@
(those all cd here, cd there, cp this, cp -f that were useless)
Revision 1.79 2007/04/07 13:53:03 rotom
-- up to 3.12.4 by Arkadiusz Macho??
+- up to 3.12.4 by Arkadiusz Machoł
Revision 1.78 2007/02/12 21:23:47 glen
- tabs in preamble
@@ -340,7 +349,7 @@
- cleanups
Revision 1.52 2004/11/05 22:26:13 kali
-- simplified bcond, added %%verify(not md5 size mtime)
+- simplified bcond, added %verify(not md5 size mtime)
- removed Source0-size
Revision 1.51 2004/11/05 20:03:42 paszczus
@@ -379,7 +388,7 @@
- removed llh patch, already in sources
Revision 1.40 2004/05/24 16:26:29 kali
-- added %%verify(not md5 size mtime) to config files
+- added %verify(not md5 size mtime) to config files
Revision 1.39 2004/05/22 22:42:14 kali
- md5 updated
@@ -396,14 +405,14 @@
- updated to 3.10.12 (almost all fixes from Zbigniew Bryczkowski)
- added init script, logrotate
- patch0 - fix dirs
-- %%post,%%preun,%%files fixes
+- %post,%preun,%files fixes
- rel. 0.9 - need to be tested
Revision 1.35 2004/04/17 18:44:10 hunter
--don't use here-files, put them into cvs.
+- don't use here-files, put them into cvs.
Revision 1.34 2004/04/17 18:29:00 hunter
--don't use configure2_13 when it's not needed.
+- don't use configure2_13 when it's not needed.
Revision 1.33 2004/04/06 17:16:53 averne
- updated to 3.10.10
@@ -413,7 +422,7 @@
- updated to 3.10.6
Revision 1.31 2003/08/06 16:12:56 kloczek
-- mo??e wrescie kto?? wykasuje to konto ?
+- może wrescie ktoś wykasuje to konto ?
Revision 1.30 2003/05/26 16:24:26 malekith
- massive attack: adding Source-md5
@@ -430,7 +439,7 @@
- umask in scripts, other fixes/cosmetics where needed
Revision 1.26 2002/04/25 15:47:17 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.25 2002/02/23 01:23:23 kloczek
- adapterized.
@@ -440,10 +449,10 @@
Group field using gettext).
Revision 1.23 2002/01/18 02:12:21 kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
Revision 1.22 2001/09/28 09:32:53 marcus
-- s/%%configure/%%configure2_13/g
+- s/%configure/%configure2_13/g
Revision 1.21 2001/09/24 09:40:59 qboosh
- Prereq: chkconfig
@@ -462,12 +471,12 @@
- release 3
Revision 1.15 2001/02/20 15:39:32 mkierus
--fix sysconfdir back to /etc
+- fix sysconfdir back to /etc
Revision 1.14 2001/01/02 06:01:40 kloczek
- added paths patch,
- spec adapterized.
-NOT: still not finished.
+ NOT: still not finished.
Revision 1.13 2001/01/01 20:49:13 areq
- fix sysconfdir=/etc/apcupsd/
@@ -476,7 +485,7 @@
- start update to 3.8.1
Revision 1.11 2000/06/09 07:22:47 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.10 2000/05/17 23:02:34 kloczek
- spec adapterized.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apcupsd/apcupsd.spec?r1=1.87.2.8&r2=1.87.2.9&f=u
More information about the pld-cvs-commit
mailing list