Hello community, here is the log from the commit of package pgadmin3 for openSUSE:Factory checked in at 2017-11-27 22:17:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pgadmin3 (Old) and /work/SRC/openSUSE:Factory/.pgadmin3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pgadmin3" Mon Nov 27 22:17:36 2017 rev:2 rq:545683 version:1.22.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pgadmin3/pgadmin3.changes 2017-11-23 09:45:14.254711155 +0100 +++ /work/SRC/openSUSE:Factory/.pgadmin3.new/pgadmin3.changes 2017-11-27 22:17:37.328352922 +0100 @@ -1,0 +2,14 @@ +Sat Nov 25 12:43:22 UTC 2017 - [email protected] + +- Fix boo#1069822 Can't build with openssl 1.1 + (Coming soon as default in Tumbleweed 201711*) + Adopt Debian way, by switching to libressl-devel. + +------------------------------------------------------------------- +Fri Nov 24 18:37:57 UTC 2017 - [email protected] + +- Added path 0002-basic-support-postgresql10.patch inspired by + openscg work on their fork pgadmin III LTS. + Connection to postgresql10 server is now possible. + +------------------------------------------------------------------- New: ---- 0002-basic-support-postgresql10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pgadmin3.spec ++++++ --- /var/tmp/diff_new_pack.nQ1DdZ/_old 2017-11-27 22:17:38.328316627 +0100 +++ /var/tmp/diff_new_pack.nQ1DdZ/_new 2017-11-27 22:17:38.332316482 +0100 @@ -29,15 +29,23 @@ Source4: https://ftp.postgresql.org/pub/pgadmin/%{name}/v%{version}/src/pgadmin3-%{version}.tar.gz.sig # Limit to strict minimum the needed wxWidgets inspired by debian patches Patch0: wxWidget-limit-libs-used.patch +# Fix row heights on hidpi screen Patch1: 0001-Set-row-heights-based-on-pixels-rather-than-points.patch +# Add basic support for postgresql10 (Based on pgadmin3 lts by bigsql +# https://bitbucket.org/openscg/pgadmin3-lts/commits/ea8a31af779b101248fc13242cb7a34e252cf49e +# https://bitbucket.org/openscg/pgadmin3-lts/commits/1d65e012f7bb88d3b6c5a08946a2456617213c35 +Patch2: 0002-basic-support-postgresql10.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libopenssl-devel +# We are not compatible with openssl1.1 changes +# So we adopt Debian way, use libressl instead. +BuildRequires: libressl-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: libxslt-devel +BuildRequires: libxslt-tools BuildRequires: postgresql-devel BuildRequires: update-desktop-files %if 0%{?suse_version} <= 1315 || 0%{?sle_version} > 0 @@ -86,6 +94,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 autoreconf -fiv sed -i 's/\r$//' LICENSE TODO CHANGELOG # remove wrong EOL ++++++ 0002-basic-support-postgresql10.patch ++++++ diff -rup a/pgadmin/include/pgAdmin3.h b/pgadmin/include/pgAdmin3.h --- a/pgadmin/include/pgAdmin3.h 2017-11-24 17:56:53.943413312 +0100 +++ b/pgadmin/include/pgAdmin3.h 2017-11-24 18:02:39.052637799 +0100 @@ -58,8 +58,8 @@ // Supported server minimum and maximum values. const short SERVER_MIN_VERSION_N = 0x0804; const wxString SERVER_MIN_VERSION_T = wxT("8.4"); -const short SERVER_MAX_VERSION_N = 0x0906; -const wxString SERVER_MAX_VERSION_T = wxT("9.6"); +const short SERVER_MAX_VERSION_N = 0x0A00; +const wxString SERVER_MAX_VERSION_T = wxT("10.0"); // Supported Greenplum Database and Greenplum HAWQ minimum and maximum values. const short GP_MIN_VERSION_N = 0x0802; diff -rup a/pgadmin/schema/pgServer.cpp b/pgadmin/schema/pgServer.cpp --- a/pgadmin/schema/pgServer.cpp 2017-11-24 17:56:53.983413455 +0100 +++ b/pgadmin/schema/pgServer.cpp 2017-11-24 18:55:43.102941932 +0100 @@ -905,13 +905,28 @@ int pgServer::Connect(frmMain *form, boo if (conn->BackendMinimumVersion(8, 5)) { sql += wxT(", CASE WHEN usesuper THEN pg_is_in_recovery() ELSE NULL END as inrecovery"); - sql += wxT(", CASE WHEN usesuper THEN pg_last_xlog_receive_location() ELSE NULL END as receiveloc"); - sql += wxT(", CASE WHEN usesuper THEN pg_last_xlog_replay_location() ELSE NULL END as replayloc"); + if (conn->BackendMinimumVersion(10, 0)) + { + sql += wxT(", CASE WHEN usesuper THEN pg_last_wal_receive_lsn() ELSE NULL END as receiveloc"); + sql += wxT(", CASE WHEN usesuper THEN pg_last_wal_replay_lsn() ELSE NULL END as replayloc"); + } + else + { + sql += wxT(", CASE WHEN usesuper THEN pg_last_xlog_receive_location() ELSE NULL END as receiveloc"); + sql += wxT(", CASE WHEN usesuper THEN pg_last_xlog_replay_location() ELSE NULL END as replayloc"); + } } if (conn->BackendMinimumVersion(9, 1)) { sql += wxT(", CASE WHEN usesuper THEN pg_last_xact_replay_timestamp() ELSE NULL END as replay_timestamp"); - sql += wxT(", CASE WHEN usesuper AND pg_is_in_recovery() THEN pg_is_xlog_replay_paused() ELSE NULL END as isreplaypaused"); + if (conn->BackendMinimumVersion(10, 0)) + { + sql += wxT(", CASE WHEN usesuper AND pg_is_in_recovery() THEN pg_is_wal_replay_paused() ELSE NULL END as isreplaypaused"); + } + else + { + sql += wxT(", CASE WHEN usesuper AND pg_is_in_recovery() THEN pg_is_xlog_replay_paused() ELSE NULL END as isreplaypaused"); + } } pgSet *set = ExecuteSet(sql + wxT("\n FROM pg_user WHERE usename=current_user"));
