commit 0515d085cb3843cae5732c73d793e62ca92586d9
Merge: 9214a4d 3be975a
Author: Andrzej Zawadzki <[email protected]>
Date: Tue Sep 25 12:28:49 2012 +0200
Merge branch 'master' of git://git.pld-linux.org/packages/postgresql
Conflicts:
postgresql.spec
postgresql.spec | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
---
diff --cc postgresql.spec
index c27d795,c58f5a5..ff41c5d
--- a/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
+cd postgresql-%{prevver}
+
+%patch0 -p1
+%{?with_absolute_dbpaths:%patch1 -p1}
+%patch2 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+cd ..
+
- tar xzf %{SOURCE4} -C contrib
- mv contrib/pldebugger-* contrib/pldebugger
-
# force rebuild of bison/flex files
find src -name \*.l -o -name \*.y | xargs touch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgresql.git/commitdiff/0515d085cb3843cae5732c73d793e62ca92586d9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
