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: 08-Mar-2008 12:43:46 Branch: HEAD Handle: 2008030811434500 Modified files: openpkg-src/postgresql postgresql.spec Log: upgrade to latest Slony-I Summary: Revision Changes Path 1.258 +9 -10 openpkg-src/postgresql/postgresql.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/postgresql/postgresql.spec ============================================================================ $ cvs diff -u -r1.257 -r1.258 postgresql.spec --- openpkg-src/postgresql/postgresql.spec 29 Feb 2008 18:45:02 -0000 1.257 +++ openpkg-src/postgresql/postgresql.spec 8 Mar 2008 11:43:45 -0000 1.258 @@ -28,8 +28,8 @@ %define V_pgperl 2.0.2 %define V_psqlodbc 08.02.0500 %define V_pgjdbc 8.3-603 -%define V_slony1 1.2.6 -%define V_slony1_dir 1215 +%define V_slony1_major 1.2 +%define V_slony1_minor 13 %define V_pgcluster 1.7.0rc7 %define V_pgcluster_dir 1372 %define V_mysqlcompat 1.0b3 @@ -46,7 +46,7 @@ Group: Database License: GPL Version: %{V_postgresql} -Release: 20080229 +Release: 20080308 # package options %option with_server yes @@ -67,7 +67,7 @@ Source1: http://pqxx.org/download/software/libpqxx/libpqxx-%{V_libpqxx}.tar.gz Source2: ftp://gborg.postgresql.org/pub/pgperl/stable/pgperl-%{V_pgperl}.tar.gz Source3: ftp://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{V_psqlodbc}.tar.gz -Source4: http://pgfoundry.org/frs/download.php/%{V_slony1_dir}/slony1-%{V_slony1}-tar.bz2 +Source4: http://slony.info/downloads/%{V_slony1_major}/source/slony1-%{V_slony1_major}.%{V_slony1_minor}.tar.bz2 Source5: http://pgfoundry.org/frs/download.php/%{V_pgcluster_dir}/pgcluster-%{V_pgcluster}.patch.tar.gz Source6: http://pgfoundry.org/frs/download.php/%{V_mysqlcompat_dir}/mysqlcompat-%{V_mysqlcompat}.tar.gz Source7: http://jdbc.postgresql.org/download/postgresql-jdbc-%{V_pgjdbc}.src.tar.gz @@ -154,10 +154,9 @@ regex = postgresql-jdbc-(\d+\.\d+-\d+)\.src\.tar\.gz } prog postgresql:slony1 = { - 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/; $_" + version = %{V_slony1_major}.%{V_slony1_minor} + url = http://slony.info/downloads/%{V_slony1_major}/source/ + regex = slony1-(\d+\.\d+\.\d+)\.tar\.bz2 } prog postgresql:pgcluster = { version = %{V_pgcluster}.%{V_pgcluster_dir} @@ -367,7 +366,7 @@ # build Slony-1 replication engine %if "%{with_slony1}" == "yes" - ( cd slony1-%{V_slony1} + ( cd slony1-%{V_slony1_major}.%{V_slony1_minor} ln ../src/pl/plpgsql/src/libplpgsql.so \ ../src/pl/plpgsql/src/plpgsql.so %{l_shtool} subst \ @@ -493,7 +492,7 @@ # install Slony-1 replication engine %if "%{with_slony1}" == "yes" - ( cd slony1-%{V_slony1} + ( cd slony1-%{V_slony1_major}.%{V_slony1_minor} %{l_shtool} subst \ -e 's;$(SQL_NAME80);$(SQL_NAME74);g' \ src/xxid/Makefile @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org