SPECS (AC-branch): postgresql.spec - up to 8.2.5 merge with HEAD -...

[zawadaa]

Author: zawadaa                      Date: Mon Oct  1 19:27:11 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 8.2.5 merge with HEAD
- STBR

---- Files affected:
SPECS:
   postgresql.spec (1.379.2.3 -> 1.379.2.4) 

---- Diffs:

================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.379.2.3 SPECS/postgresql.spec:1.379.2.4
--- SPECS/postgresql.spec:1.379.2.3	Sat Apr 21 17:21:27 2007
+++ SPECS/postgresql.spec	Mon Oct  1 21:27:06 2007
@@ -21,12 +21,12 @@
 Summary(uk):	PostgreSQL - ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÂÁÚÁÍÉ ÄÁÎÉÈ
 Summary(zh_CN):	PostgreSQL ¿Í»§¶Ë³ÌÐòºÍ¿âÎļþ
 Name:		postgresql
-Version:	8.2.4
+Version:	8.2.5
 Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	af7ec100a33c41bfb8d87b5e0ec2f44a
+# Source0-md5:	bb1cd309ea72f070cb964736f5755847
 Source1:	%{name}.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -35,10 +35,9 @@
 # Source8-md5:	d307e4ab8cb6900a1c290a5dde1bdeee
 Patch0:		%{name}-conf.patch
 Patch1:		%{name}-absolute_dbpaths.patch
-Patch2:		%{name}-version.patch
-Patch3:		%{name}-ecpg_link.patch
-Patch4:		%{name}-ecpg-includedir.patch
-Patch5:		%{name}-pg_ctl-fix.patch
+Patch2:		%{name}-ecpg_link.patch
+Patch3:		%{name}-ecpg-includedir.patch
+Patch4:		%{name}-pg_ctl-fix.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -798,7 +797,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
 
 %if %{with php}
 patch -p1 < plphp.patch
@@ -1196,6 +1194,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.379.2.4  2007/10/01 19:27:06  zawadaa
+- up to 8.2.5 merge with HEAD
+- STBR
+
 Revision 1.379.2.3  2007/04/21 15:21:27  radek
 - release 1, STBR to ac-updates
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postgresql.spec?r1=1.379.2.3&r2=1.379.2.4&f=u