OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Dec-2006 08:21:27
Branch: HEAD Handle: 2006121107212600
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
upgrade to Slony1 1.2.1 and cleanup tracking
Summary:
Revision Changes Path
1.214 +12 -10 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.213 -r1.214 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 7 Dec 2006 15:59:36 -0000
1.213
+++ openpkg-src/postgresql/postgresql.spec 11 Dec 2006 07:21:26 -0000
1.214
@@ -29,7 +29,8 @@
%define V_perl 5.8.8
%define V_pgperl 2.0.2
%define V_psqlodbc 08.02.0200
-%define V_slony1 1.1.5
+%define V_slony1 1.2.1
+%define V_slony1_dir 1167
%define V_pgcluster 1.5.0rc10
%define V_pgcluster_dir 1165
%define V_mysqlcompat 1.0b3
@@ -46,7 +47,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20061207
+Release: 20061211
# package options
%option with_server yes
@@ -68,7 +69,7 @@
Source2:
ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-%{V_libpqxx}.tar.gz
Source3:
ftp://gborg.postgresql.org/pub/pgperl/stable/pgperl-%{V_pgperl}.tar.gz
Source4:
ftp://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{V_psqlodbc}.tar.gz
-Source5:
http://developer.postgresql.org/~wieck/slony1/download/slony1-%{V_slony1}.tar.bz2
+Source5:
http://pgfoundry.org/frs/download.php/%{V_slony1_dir}/slony1-%{V_slony1}-tar.bz2
Source6:
http://pgfoundry.org/frs/download.php/%{V_pgcluster_dir}/pgcluster-%{V_pgcluster}-patch.tar.gz
Source7:
http://pgfoundry.org/frs/download.php/%{V_mysqlcompat_dir}/mysqlcompat-%{V_mysqlcompat}.tar.gz
Source8: rc.postgresql
@@ -150,19 +151,20 @@
regex = psqlodbc-(\d{2}\.\d{2}\.\d{4})\.tar\.gz
}
prog postgresql:slony1 = {
- version = %{V_slony1}
- url = http://developer.postgresql.org/~wieck/slony1/download/
- regex = slony1-(\d+\.\d+\.\d+)\.tar\.bz2
+ version = %{V_slony1}.%{V_slony1_dir}
+ url = http://pgfoundry.org/frs/?group_id=1000122
+ regex = /(\d+/slony1-\d+\.\d+\.\d+)[-.]tar\.bz2
+ transform = "s/^(\\d+)\/slony1-(\d+\.\d+\.\d+)$/$2.$1/; $_"
}
prog postgresql:pgcluster = {
version = %{V_pgcluster}.%{V_pgcluster_dir}
- url = http://pgfoundry.org/frs/?group_id=1000072&release_id=168
+ url = http://pgfoundry.org/frs/?group_id=1000072
regex = /(\d+/pgcluster-1\.[56]\.__VER__)-patch\.tar\.gz
transform = "s/^(\\d+)\/pgcluster-(.+)$/$2.$1/; $_"
}
prog postgresql:mysqlcompat = {
version = %{V_mysqlcompat}.%{V_mysqlcompat_dir}
- url = http://pgfoundry.org/frs/?group_id=1000154&release_id=379
+ url = http://pgfoundry.org/frs/?group_id=1000154
regex = (\d+/mysqlcompat-__VER__)\.tar\.gz
transform = "s/^(\\d+)\/mysqlcompat-(.+)$/$2.$1/; $_"
}
@@ -375,8 +377,8 @@
ln ../src/pl/plpgsql/src/libplpgsql.so \
../src/pl/plpgsql/src/plpgsql.so
%{l_shtool} subst \
- -e 's;-lpq;-lpq -lssl -lcrypto -lcrypt;' \
- src/slon/Makefile src/slonik/Makefile
+ -e 's;-lpq;-lpq @LIBS@;' \
+ Makefile.global.in
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
export CPPFLAGS="%{l_cppflags}"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
