packages: pgadmin3/pgadmin3-m4.patch, pgadmin3/pgadmin3.spec - up to 1.14.0

[arekm]

Author: arekm                        Date: Sat Sep 17 08:16:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.14.0

---- Files affected:
packages/pgadmin3:
   pgadmin3-m4.patch (1.7 -> 1.8) , pgadmin3.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: packages/pgadmin3/pgadmin3-m4.patch
diff -u packages/pgadmin3/pgadmin3-m4.patch:1.7 packages/pgadmin3/pgadmin3-m4.patch:1.8
--- packages/pgadmin3/pgadmin3-m4.patch:1.7	Wed Sep 22 23:01:22 2010
+++ packages/pgadmin3/pgadmin3-m4.patch	Sat Sep 17 10:16:13 2011
@@ -1,18 +1,18 @@
---- 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 @@
+--- pgadmin3-1.14.0/acinclude.m4~	2011-09-17 10:05:51.000000000 +0200
++++ pgadmin3-1.14.0/acinclude.m4	2011-09-17 10:09:19.127611445 +0200
+@@ -69,41 +69,9 @@
  ####################
  AC_DEFUN([LOCATE_WXWIDGETS],
  [
--	AC_ARG_WITH(wx, [  --with-wx=DIR	   root directory for wxWidgets installation],
+-	AC_ARG_WITH(wx, [  --with-wx=DIR		root directory for wxWidgets installation],
 -	[
 -		if test "$withval" != no
 -		then
 -			WX_HOME="$withval"
--						if test ! -f "${WX_HOME}/bin/wx-config"
--						then
--								AC_MSG_ERROR([Could not find your wxWidgets installation in ${WX_HOME}])
--						fi
+-			if test ! -f "${WX_HOME}/bin/wx-config"
+-			then
+-				AC_MSG_ERROR([Could not find your wxWidgets installation in ${WX_HOME}])
+-			fi
 -
 -		fi
 -		WX_CONFIG=${WX_HOME}/bin/wx-config
@@ -45,79 +45,21 @@
  	])
  ])
  
-@@ -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
--		else
--			PG_SSL="no"
-+			PG_SSL="yes"
+--- pgadmin3-1.14.0/acinclude.m4~	2011-09-17 10:09:39.000000000 +0200
++++ pgadmin3-1.14.0/acinclude.m4	2011-09-17 10:13:44.928871229 +0200
+@@ -475,6 +475,7 @@
+ 		else
+ 			PG_SSL="no"
  		fi
++		PG_SSL=yes
  
  		if test "$LIB_KRB5" = "yes"
  		then
--		# 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
--		else
--			PG_KRB5="no"
-+			PG_KRB5="yes"
+@@ -512,6 +513,7 @@
+ 		else
+ 			PG_KRB5="no"
  		fi
++		PG_KRB5=yes
  
  		AC_LANG_RESTORE
+ 

================================================================
Index: packages/pgadmin3/pgadmin3.spec
diff -u packages/pgadmin3/pgadmin3.spec:1.51 packages/pgadmin3/pgadmin3.spec:1.52
--- packages/pgadmin3/pgadmin3.spec:1.51	Wed May 18 16:59:41 2011
+++ packages/pgadmin3/pgadmin3.spec	Sat Sep 17 10:16:13 2011
@@ -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.12.3
+Version:	1.14.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:	0ff7a970a14757ee951a4e8b1a246a70
+# Source0-md5:	27bf1694809a7d9adf4feec508374df2
 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.52  2011/09/17 08:16:13  arekm
+- up to 1.14.0
+
 Revision 1.51  2011/05/18 14:59:41  zawadaa
 - up to 1.12.3
 - STBR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3-m4.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3.spec?r1=1.51&r2=1.52&f=u