Merge branch 'master' of git://git.pld-linux.org/packages/postgresql

Conflicts:
	postgresql.spec

diff --cc postgresql.spec
index c27d79502ec9e5ff624160c27e83b29dd9c30348,c58f5a5d136d2534e030964546cf1689f153307a..ff41c5d97bb8ec9d9d8e59c37faec2dfa27ab081
--- 1/postgresql.spec
--- 2/postgresql.spec
+++ b/postgresql.spec
@@@ -43,13 -40,8 +43,10 @@@ Source1:    %{name}.ini
  Source2:      pgsql-Database-HOWTO-html.tar.gz
  # Source2-md5:        5b656ddf1db41965761f85204a14398e
  Source3:      %{name}.sysconfig
- # http://git.postgresql.org/gitweb/?p=pldebugger.git;a=snapshot;h=eb754b6ba9a1c18e7bc4ddf521408be06768c697;sf=tgz 
- Source4:      pldebugger-eb754b6.tar.gz
- # Source4-md5:        e596193b87695d29fa9161e7182dcd32
  Source5:      %{name}.upstart
  Source6:      %{name}-instance.upstart
 +Source7:      ftp://ftp.postgresql.org/pub/source/v%{prevver}/%{name}-%{prevver}.tar.bz2
 +# Source7-md5:        000755f66c0de58bbd4cd2b89b45b8e2
  Patch0:               %{name}-conf.patch
  Patch1:               %{name}-absolute_dbpaths.patch
  Patch2:               %{name}-ecpg-includedir.patch
@@@ -802,19 -776,6 +799,16 @@@ version of PostgreSQL
  %patch4 -p1
  %patch5 -p1
  
- tar xzf %{SOURCE4} -C contrib
- mv contrib/pldebugger-* contrib/pldebugger
- 
 +cd postgresql-%{prevver}
 +
 +%patch0 -p1
 +%{?with_absolute_dbpaths:%patch1 -p1}
 +%patch2 -p1
 +%patch4 -p1
 +%patch5 -p1
 +%patch6 -p1
 +cd ..
 +
  # force rebuild of bison/flex files
  find src -name \*.l -o -name \*.y | xargs touch