rpms/haproxy/F-9 .cvsignore, 1.10, 1.11 haproxy.spec, 1.14, 1.15 sources, 1.10, 1.11 haproxy-1.3-error-reporting.patch, 1.1, NONE haproxy-1.3-mandir.patch, 1.1, NONE

[Jeremy Hinegardner]

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22101/F-9

Modified Files:
	.cvsignore haproxy.spec sources 
Removed Files:
	haproxy-1.3-error-reporting.patch haproxy-1.3-mandir.patch 
Log Message:
update to 1.3.15.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Nov 2008 21:24:02 -0000	1.10
+++ .cvsignore	31 Dec 2008 04:35:37 -0000	1.11
@@ -1 +1 @@
-haproxy-1.3.15.6.tar.gz
+haproxy-1.3.15.7.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/haproxy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- haproxy.spec	22 Nov 2008 21:13:30 -0000	1.14
+++ haproxy.spec	31 Dec 2008 04:35:37 -0000	1.15
@@ -5,8 +5,8 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.15.6
-Release:        2%{?dist}
+Version:        1.3.15.7
+Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -17,10 +17,6 @@
 Source1:        %{name}.init
 Source2:        %{name}.cfg
 
-# patches from upstream, these will be merged into the next release
-Patch0:         haproxy-1.3-mandir.patch
-Patch1:         haproxy-1.3-error-reporting.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
 
@@ -45,8 +41,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .mandir
-%patch1 -p1 -b .error-reporting
 
 
 %build
@@ -133,6 +127,10 @@
 
 
 %changelog
+* Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.15.7-1
+- update to 1.3.15.7
+- remove upstream patches, they are now part of source distribution
+
 * Sat Nov 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.15.6-2
 - apply upstream patches 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Nov 2008 21:24:03 -0000	1.10
+++ sources	31 Dec 2008 04:35:37 -0000	1.11
@@ -1 +1 @@
-470cfd76b3a5608f4db02930c556d1e2  haproxy-1.3.15.6.tar.gz
+6c1978071139c5cc27563232c2a488da  haproxy-1.3.15.7.tar.gz


--- haproxy-1.3-error-reporting.patch DELETED ---


--- haproxy-1.3-mandir.patch DELETED ---