packages: pgadmin3/pgadmin3-m4.patch, pgadmin3/pgadmin3.spec - updated to 1...
charles
charles at pld-linux.org
Wed Sep 22 23:01:30 CEST 2010
Author: charles Date: Wed Sep 22 21:01:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.12.0
---- Files affected:
packages/pgadmin3:
pgadmin3-m4.patch (1.6 -> 1.7) , pgadmin3.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: packages/pgadmin3/pgadmin3-m4.patch
diff -u packages/pgadmin3/pgadmin3-m4.patch:1.6 packages/pgadmin3/pgadmin3-m4.patch:1.7
--- packages/pgadmin3/pgadmin3-m4.patch:1.6 Thu Jul 2 08:22:28 2009
+++ packages/pgadmin3/pgadmin3-m4.patch Wed Sep 22 23:01:22 2010
@@ -1,5 +1,5 @@
---- pgadmin3/acinclude.m4.org 2007-08-28 12:53:35.228151478 +0200
-+++ pgadmin3/acinclude.m4 2007-08-28 12:54:31.519665591 +0200
+--- pgadmin3-1.12.0/acinclude.m4.orig 2010-09-01 15:30:36.000000000 +0200
++++ pgadmin3-1.12.0/acinclude.m4 2010-09-22 22:48:12.000000000 +0200
@@ -108,41 +108,9 @@
####################
AC_DEFUN([LOCATE_WXWIDGETS],
@@ -27,14 +27,14 @@
- WX_HOME=/usr
- if test ! -f "${WX_HOME}/bin/wx-config"
- then
-- # Search the path
+- # Search the path
- AC_PATH_PROGS(WX_CONFIG, wx-config)
-- if test ! -f "${WX_CONFIG}"
+- if test ! -f "${WX_CONFIG}"
- then
-- AC_MSG_ERROR([Could not find your wxWidgets installation. You might need to use the --with-wx=DIR configure option])
-- else
+- AC_MSG_ERROR([Could not find your wxWidgets installation. You might need to use the --with-wx=DIR configure option])
+- else
- WX_HOME=`${WX_CONFIG} --prefix`
-- fi
+- fi
- fi
- fi
- fi
@@ -44,39 +44,39 @@
+ WX_CONFIG="$withval"
])
])
-
-@@ -458,73 +426,12 @@
+
+@@ -499,73 +467,12 @@
if test "$LIB_SSL" = "yes"
then
-- # Check for SSL support
-- if test "$BUILD_STATIC" = "yes"
-- then
-- AC_MSG_CHECKING(for SSL_connect in libpq.a)
-- if test "$(nm ${PG_LIB}/libpq.a | grep -c SSL_connect)" -gt 0
-- then
-- AC_MSG_RESULT(present)
-- PG_SSL="yes"
-- else
-- AC_MSG_RESULT(not present)
-- PG_SSL="no"
-- fi
-- else
-- if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
-- then
-- AC_MSG_CHECKING(for SSL_connect in -lpq)
-- if test "$(otool -L ${PG_LIB}/libpq.?.dylib | grep -c libssl)" -gt 0
-- then
-- AC_MSG_RESULT(present)
-- PG_SSL="yes"
-- else
-- AC_MSG_RESULT(not present)
-- PG_SSL="no"
-- fi
-- else
-- AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
-- fi
-- fi
+- # Check for SSL support
+- if test "$BUILD_STATIC" = "yes"
+- then
+- AC_MSG_CHECKING(for SSL_connect in libpq.a)
+- if test "$(nm ${PG_LIB}/libpq.a | grep -c SSL_connect)" -gt 0
+- then
+- AC_MSG_RESULT(present)
+- PG_SSL="yes"
+- else
+- AC_MSG_RESULT(not present)
+- PG_SSL="no"
+- fi
+- else
+- if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
+- then
+- AC_MSG_CHECKING(for SSL_connect in -lpq)
+- if test "$(otool -L ${PG_LIB}/libpq.?.dylib | grep -c libssl)" -gt 0
+- then
+- AC_MSG_RESULT(present)
+- PG_SSL="yes"
+- else
+- AC_MSG_RESULT(not present)
+- PG_SSL="no"
+- fi
+- else
+- AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
+- fi
+- fi
- else
- PG_SSL="no"
+ PG_SSL="yes"
@@ -84,37 +84,37 @@
if test "$LIB_KRB5" = "yes"
then
-- # Check for Kerberos support
+- # Check for Kerberos support
-
- LDFLAGS="$LDFLAGS -lkrb5"
-
-- if test "$BUILD_STATIC" = "yes"
-- then
-- AC_MSG_CHECKING(for krb5_free_principal in libpq.a)
-- if test "$(nm ${PG_LIB}/libpq.a | grep -c krb5_free_principal)" -gt 0
-- then
-- AC_MSG_RESULT(present)
-- PG_KRB5="yes"
-- else
-- AC_MSG_RESULT(not present)
-- PG_KRB5="no"
-- fi
-- else
-- if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
-- then
-- AC_MSG_CHECKING(for krb5_free_principle in -lpq)
-- if test "$(otool -L ${PG_LIB}/libpq.?.dylib | grep -c libkrb5)" -gt 0
-- then
-- AC_MSG_RESULT(present)
-- PG_KRB5="yes"
-- else
-- AC_MSG_RESULT(not present)
-- PG_KRB5="no"
-- fi
-- else
-- AC_CHECK_LIB(pq, krb5_free_principal, [PG_KRB5=yes], [PG_KRB5=no])
-- fi
-- fi
+- if test "$BUILD_STATIC" = "yes"
+- then
+- AC_MSG_CHECKING(for krb5_free_principal in libpq.a)
+- if test "$(nm ${PG_LIB}/libpq.a | grep -c krb5_free_principal)" -gt 0
+- then
+- AC_MSG_RESULT(present)
+- PG_KRB5="yes"
+- else
+- AC_MSG_RESULT(not present)
+- PG_KRB5="no"
+- fi
+- else
+- if test "$build_cpu-$build_vendor" = "powerpc-apple" -o "$build_cpu-$build_vendor" = "i386-apple" -o "$build_cpu-$build_vendor" = "i686-apple"
+- then
+- AC_MSG_CHECKING(for krb5_free_principle in -lpq)
+- if test "$(otool -L ${PG_LIB}/libpq.?.dylib | grep -c libkrb5)" -gt 0
+- then
+- AC_MSG_RESULT(present)
+- PG_KRB5="yes"
+- else
+- AC_MSG_RESULT(not present)
+- PG_KRB5="no"
+- fi
+- else
+- AC_CHECK_LIB(pq, krb5_free_principal, [PG_KRB5=yes], [PG_KRB5=no])
+- fi
+- fi
- else
- PG_KRB5="no"
+ PG_KRB5="yes"
================================================================
Index: packages/pgadmin3/pgadmin3.spec
diff -u packages/pgadmin3/pgadmin3.spec:1.46 packages/pgadmin3/pgadmin3.spec:1.47
--- packages/pgadmin3/pgadmin3.spec:1.46 Sat Jul 31 22:49:35 2010
+++ packages/pgadmin3/pgadmin3.spec Wed Sep 22 23:01:22 2010
@@ -2,13 +2,13 @@
Summary: Powerful administration and development platform for the PostgreSQL
Summary(pl.UTF-8): Potężna platforma do administrowania i programowania bazy PostgreSQL
Name: pgadmin3
-Version: 1.10.5
+Version: 1.12.0
Release: 1
Epoch: 0
License: Artistic
Group: Applications/Databases
Source0: ftp://ftp6.pl.postgresql.org/pub/postgresql/pgadmin3/release/v%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 00d71f2fd982879dfd80b9aa07b3bf7d
+# Source0-md5: ab004323c4f83f2d59bc538d7eca1fab
Source1: %{name}.desktop
Patch0: %{name}-m4.patch
URL: http://www.pgadmin.org/
@@ -84,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2010/09/22 21:01:22 charles
+- updated to 1.12.0
+
Revision 1.46 2010/07/31 20:49:35 arekm
- up to 1.10.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3-m4.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3.spec?r1=1.46&r2=1.47&f=u
More information about the pld-cvs-commit
mailing list