Author: arekm Date: Thu Jul 2 06:22:34 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.10.0
---- Files affected:
packages/pgadmin3:
pgadmin3-m4.patch (1.5 -> 1.6) , pgadmin3.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: packages/pgadmin3/pgadmin3-m4.patch
diff -u packages/pgadmin3/pgadmin3-m4.patch:1.5
packages/pgadmin3/pgadmin3-m4.patch:1.6
--- packages/pgadmin3/pgadmin3-m4.patch:1.5 Sat Jul 5 16:55:35 2008
+++ packages/pgadmin3/pgadmin3-m4.patch Thu Jul 2 08:22:28 2009
@@ -1,9 +1,54 @@
---- pgadmin3/acinclude.m4.org 2007-08-28 12:50:06.399047988 +0200
-+++ pgadmin3/acinclude.m4 2007-08-28 12:50:52.597961689 +0200
-@@ -408,63 +408,9 @@
- AC_LANG_SAVE
- AC_LANG_C
+--- pgadmin3/acinclude.m4.org 2007-08-28 12:53:35.228151478 +0200
++++ pgadmin3/acinclude.m4 2007-08-28 12:54:31.519665591 +0200
+@@ -108,41 +108,9 @@
+ ####################
+ AC_DEFUN([LOCATE_WXWIDGETS],
+ [
+- 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
+-
+- fi
+- WX_CONFIG=${WX_HOME}/bin/wx-config
+- ],
+- [
+- WX_HOME=/usr/local/wx2
+- if test ! -f "${WX_HOME}/bin/wx-config"
+- then
+- WX_HOME=/usr/local
+- if test ! -f "${WX_HOME}/bin/wx-config"
+- then
+- WX_HOME=/usr
+- if test ! -f "${WX_HOME}/bin/wx-config"
+- then
+- # Search the path
+- AC_PATH_PROGS(WX_CONFIG, 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
+- WX_HOME=`${WX_CONFIG} --prefix`
+- fi
+- fi
+- fi
+- fi
+- WX_CONFIG=${WX_HOME}/bin/wx-config
++ WX_HOME=/usr
++ AC_ARG_WITH(wx-config, [ --with-wx-config=FILE wx-config file],[
++ WX_CONFIG="$withval"
+ ])
+ ])
+
+@@ -458,73 +426,12 @@
+ if test "$LIB_SSL" = "yes"
+ then
- # Check for SSL support
- if test "$BUILD_STATIC" = "yes"
- then
@@ -32,8 +77,17 @@
- AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes],
[PG_SSL=no])
- fi
- fi
+- else
+- PG_SSL="no"
++ PG_SSL="yes"
+ fi
+ 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)
@@ -61,55 +115,9 @@
- AC_CHECK_LIB(pq, krb5_free_principal,
[PG_KRB5=yes], [PG_KRB5=no])
- fi
- fi
-+ PG_SSL="yes"
-+ PG_KRB5="yes"
+- else
+- PG_KRB5="no"
++ PG_KRB5="yes"
+ fi
AC_LANG_RESTORE
-
---- pgadmin3/acinclude.m4.org 2007-08-28 12:53:35.228151478 +0200
-+++ pgadmin3/acinclude.m4 2007-08-28 12:54:31.519665591 +0200
-@@ -108,41 +108,9 @@
- ####################
- AC_DEFUN([LOCATE_WXWIDGETS],
- [
-- 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
--
-- fi
-- WX_CONFIG=${WX_HOME}/bin/wx-config
-- ],
-- [
-- WX_HOME=/usr/local/wx2
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- WX_HOME=/usr/local
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- WX_HOME=/usr
-- if test ! -f "${WX_HOME}/bin/wx-config"
-- then
-- # Search the path
-- AC_PATH_PROGS(WX_CONFIG, 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
-- WX_HOME=`${WX_CONFIG} --prefix`
-- fi
-- fi
-- fi
-- fi
-- WX_CONFIG=${WX_HOME}/bin/wx-config
-+ WX_HOME=/usr
-+ AC_ARG_WITH(wx-config, [ --with-wx-config=FILE wx-config file],[
-+ WX_CONFIG="$withval"
- ])
- ])
-
================================================================
Index: packages/pgadmin3/pgadmin3.spec
diff -u packages/pgadmin3/pgadmin3.spec:1.39
packages/pgadmin3/pgadmin3.spec:1.40
--- packages/pgadmin3/pgadmin3.spec:1.39 Sat Jul 5 16:55:21 2008
+++ packages/pgadmin3/pgadmin3.spec Thu Jul 2 08:22:28 2009
@@ -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.8.4
+Version: 1.10.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: 12fc6027f651788615a7fa1c6ddbcdb3
+# Source0-md5: 3f2032c78657e3db4e0719613751060c
Source1: %{name}.desktop
Patch0: %{name}-m4.patch
URL: http://www.pgadmin.org/
@@ -43,20 +43,6 @@
instalatorem i nie wymaga żadnego dodatkowego sterownika do
komunikowania z serwerem baz danych.
-%package -n postgresql-module-pgadmin3
-Summary: Full instrumentation when using PgAdmin
-Summary(pl.UTF-8): Pełna obsługa dla funkcjonalności PgAdmina
-Group: Applications/Databases
-Requires: postgresql >= 8.1
-
-%description -n postgresql-module-pgadmin3
-Module which implements a number of support functions which PgAdmin
-will use to provide additional functionality if installed on a server.
-
-%description -n postgresql-module-pgadmin3 -l pl.UTF-8
-Ten moduł implementuje wiele funkcji pomocniczych, które używa PgAdmin
-do zapewnienia dodatkowej funkcjonalności.
-
%prep
%setup -q
%patch0 -p1
@@ -71,11 +57,6 @@
--with-wx-version="2.8"
%{__make}
-sed 's#MODULE_PATHNAME#%{_pgmoduledir}/admin81#g' xtra/admin81/admin81.sql.in
> xtra/admin81/admin81.sql
-sed -i -e 's#DLLIMPORT#PGDLLIMPORT#g' xtra/admin81/admin81.c
-%{__cc} %{rpmcflags} -fpic -I. -I%{_includedir}/postgresql/server -c -o
xtra/admin81/admin81.o xtra/admin81/admin81.c -MMD
-%{__cc} -shared %{rpmldflags} -o xtra/admin81/admin81.so xtra/admin81/admin81.o
-
%install
rm -rf $RPM_BUILD_ROOT
install -d \
@@ -86,8 +67,6 @@
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
install pkg/debian/pgadmin3.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/pgadmin3.xpm
-install xtra/admin81/admin81.so $RPM_BUILD_ROOT%{_pgmoduledir}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,17 +78,15 @@
%{_desktopdir}/pgadmin3.desktop
%{_pixmapsdir}/pgadmin3.xpm
-%files -n postgresql-module-pgadmin3
-%defattr(644,root,root,755)
-%doc xtra/admin81/README* xtra/admin81/*.sql
-%attr(755,root,root) %{_pgmoduledir}/*.so
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2009/07/02 06:22:28 arekm
+- up to 1.10.0
+
Revision 1.39 2008/07/05 14:55:21 arekm
- up to 1.8.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3-m4.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgadmin3/pgadmin3.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
