rpms/apcupsd/F-7 .cvsignore, 1.9, 1.10 apcupsd.spec, 1.20, 1.21 sources, 1.9, 1.10 apcupsd-3.14.1-linux-usb.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/apcupsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30297

Modified Files:
	.cvsignore apcupsd.spec sources 
Removed Files:
	apcupsd-3.14.1-linux-usb.patch 
Log Message:
* Wed Oct 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.2-1
- Update to 3.14.2, remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2007 17:06:35 -0000	1.9
+++ .cvsignore	10 Oct 2007 23:01:34 -0000	1.10
@@ -1 +1 @@
-apcupsd-3.14.1.tar.gz
+apcupsd-3.14.2.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/F-7/apcupsd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apcupsd.spec	2 Aug 2007 15:19:23 -0000	1.20
+++ apcupsd.spec	10 Oct 2007 23:01:34 -0000	1.21
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.1
-Release:      3%{?dist}
+Version:      3.14.2
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -10,8 +10,6 @@
 Source1:      apcupsd.logrotate
 Source2:      apcupsd-httpd.conf
 Patch0:       apcupsd-3.14.1-init.patch
-Patch1:       apcupsd-3.14.1-linux-usb.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
@@ -57,8 +55,6 @@
 %prep
 %setup -q
 %patch -p1 -b .init
-%patch1 -p1 -b .linux-usb
-%patch2 -p1 -b .cloexec
 # Don't strip binaries
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
@@ -174,6 +170,9 @@
 
 
 %changelog
+* Wed Oct 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.2-1
+- Update to 3.14.2, remove upstreamed patches
+
 * Wed Aug  1 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.1-3
 - Add patch to close open file descriptors (bug #247162)
 - Stop/restart service as needed on removal/upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2007 17:06:35 -0000	1.9
+++ sources	10 Oct 2007 23:01:34 -0000	1.10
@@ -1 +1 @@
-258eb7515a12de493bb8952bc6d2f4e1  apcupsd-3.14.1.tar.gz
+fd8785e7607d20cefa68dc20e44eebc4  apcupsd-3.14.2.tar.gz


--- apcupsd-3.14.1-linux-usb.patch DELETED ---