rpms/apcupsd/EL-5 .cvsignore, 1.6, 1.7 apcupsd.spec, 1.12, 1.13 sources, 1.6, 1.7

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/apcupsd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28395

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Let's start with 3.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2006 16:43:01 -0000	1.6
+++ .cvsignore	23 Mar 2007 15:24:26 -0000	1.7
@@ -1 +1 @@
-apcupsd-3.12.4.tar.gz
+apcupsd-3.14.0.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/EL-5/apcupsd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apcupsd.spec	5 Jan 2007 18:35:30 -0000	1.12
+++ apcupsd.spec	23 Mar 2007 15:24:26 -0000	1.13
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.12.4
-Release:      4%{?dist}
+Version:      3.14.0
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -12,8 +12,9 @@
 Patch0:       apcupsd-3.10.18-init.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix
-BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers
+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
 Requires:      /bin/mail
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -40,13 +41,22 @@
 A CGI interface to the APC UPS monitoring daemon.
 
 
+%package gui
+Summary:      GUI interface for apcupsd
+Group:        Applications/System
+Requires:     %{name} = %{version}-%{release}
+
+%description gui
+A GUI interface to the APC UPS monitoring daemon.
+
+
 %prep
 %setup -q
 %patch -p1 -b .init
-dos2unix examples/*status examples/*.c
 # Don't strip binaries
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
+
 %build
 %configure \
         --sysconfdir="%{_sysconfdir}/apcupsd" \
@@ -54,7 +64,6 @@
         --enable-cgi \
         --enable-pthreads \
         --enable-net \
-        --enable-master-slave \
         --enable-apcsmart \
         --enable-dumb \
         --enable-net-snmp \
@@ -62,13 +71,13 @@
         --enable-usb \
         --enable-powerflute \
         --enable-nls \
+        --enable-gapcmon \
+        --enable-pcnet \
         --with-libwrap=%{_libdir} \
         --with-serial-dev= \
         --with-upstype=usb \
         --with-upscable=usb \
         APCUPSD_MAIL=/bin/mail
-
-
 make
 
 
@@ -93,6 +102,12 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
+desktop-file-install --vendor="fedora" \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+        --delete-original \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
+
+# Cleanup for later %doc processing
 chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
@@ -115,8 +130,6 @@
 %config(noreplace) %{_sysconfdir}/apcupsd/commok
 %config(noreplace) %{_sysconfdir}/apcupsd/offbattery
 %config(noreplace) %{_sysconfdir}/apcupsd/onbattery
-%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect
-%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
 %attr(0755,root,root) %{_sbindir}/*
 %{_mandir}/*/*
@@ -127,6 +140,17 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
 %{_localstatedir}/www/apcupsd/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/gapcmon
+%{_datadir}/applications/fedora-gapcmon.desktop
+%{_datadir}/pixmaps/apcupsd.png
+%{_datadir}/pixmaps/charging.png
+%{_datadir}/pixmaps/gapc_prefs.png
+%{_datadir}/pixmaps/onbatt.png
+%{_datadir}/pixmaps/online.png
+%{_datadir}/pixmaps/unplugged.png
+
 
 %post
 # add our links
@@ -143,8 +167,15 @@
 
 
 %changelog
-* Fri Jan  5 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-4
-- Mark everying in /etc/apcupsd noreplace
+* Mon Feb 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.0-1
+- Update to 3.14.0
+
+* Fri Jan  5 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.13.9-2
+- Mark everything in /etc/apcupsd noreplace
+- Change BR to tcp_wrappers-devel
+
+* Thu Nov 30 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.13.9-1
+- Update to 3.13.9, add gui package
 
 * Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-3
 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
@@ -182,13 +213,13 @@
 - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support
 
 * Mon Oct 17 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-3
-- Removed %{_smp_mflags} from make, broke builds
+- Removed %%{_smp_mflags} from make, broke builds
 - Patch init file to not start automatically and add reload
 - Mark css file config
 - Require /sbin/chkconfig
 
 * Mon Oct 17 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-2
-- Add %defattr to -cgi package
+- Add %%defattr to -cgi package
 
 * Wed Aug 17 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-1
 - Initial Fedora Version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2006 16:43:01 -0000	1.6
+++ sources	23 Mar 2007 15:24:26 -0000	1.7
@@ -1 +1 @@
-669c833ec02a2bc29fa98f845e5f5de5  apcupsd-3.12.4.tar.gz
+334fe3413c08f14acec0226e71e98e0a  apcupsd-3.14.0.tar.gz