[arch-commits] Commit in libgda/repos (4 files)

[Jan de Groot]

    Date: Monday, April 20, 2009 @ 16:31:31
  Author: jgc
Revision: 36248

Merged revisions 36065,36247 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libgda/trunk

........
  r36065 | jgc | 2009-04-19 20:30:52 +0000 (Sun, 19 Apr 2009) | 1 line
  
  upgpkg: libgda 4.0.2-1
........
  r36247 | jgc | 2009-04-20 20:31:09 +0000 (Mon, 20 Apr 2009) | 1 line
  
  upgpkg: libgda 4.0.2-1
........

Modified:
  libgda/repos/extra-x86_64/	(properties)
  libgda/repos/extra-x86_64/PKGBUILD
Deleted:
  libgda/repos/extra-x86_64/bdb43.patch
  libgda/repos/extra-x86_64/libgda.install

----------------+
 PKGBUILD       |   16 ++++++++--------
 bdb43.patch    |   18 ------------------
 libgda.install |   16 ----------------
 3 files changed, 8 insertions(+), 42 deletions(-)


Property changes on: libgda/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libgda/trunk:1-32377
   + /libgda/trunk:1-36247

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-20 20:31:09 UTC (rev 36247)
+++ extra-x86_64/PKGBUILD	2009-04-20 20:31:31 UTC (rev 36248)
@@ -3,22 +3,22 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=libgda
-pkgver=4.0.1
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('glib2>=2.20.0' 'libxslt' 'db>=4.7' 'ncurses>=5.7-2' 'libsoup>=2.26.0'
-         'libmysqlclient>=5.1.32-2' 'postgresql-libs>=8.3.7' 'libldap>=2.3.43-3' 'unixodbc' 'sqlite3>=3.6.11')
-makedepends=('intltool' 'pkgconfig')
+depends=('glib2>=2.20.1' 'libxslt' 'db>=4.7' 'ncurses>=5.7-2' 'libsoup>=2.26.1'
+         'libmysqlclient>=5.1.32-2' 'postgresql-libs>=8.3.7' 'libldap>=2.3.43-3' 'unixodbc' 'sqlite3>=3.6.13')
+makedepends=('intltool' 'pkgconfig' 'openjdk6')
 options=('!libtool')
 url="http://www.gnome-db.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/4.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7449861d4f421cd3cd20e670434122fb')
+md5sums=('cd79f6542cdd9477017b76b5f81c776f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Deleted: extra-x86_64/bdb43.patch
===================================================================
--- extra-x86_64/bdb43.patch	2009-04-20 20:31:09 UTC (rev 36247)
+++ extra-x86_64/bdb43.patch	2009-04-20 20:31:31 UTC (rev 36248)
@@ -1,18 +0,0 @@
-diff -r -u libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c libgda-1.2.0/providers/bdb/gda-bdb-recordset.c
---- libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c	2003-12-17 11:27:02.000000000 +0000
-+++ libgda-1.2.0/providers/bdb/gda-bdb-recordset.c	2005-02-19 15:43:12.000000000 +0000
-@@ -227,10 +227,14 @@
- 
- 	/* get the number of records in the database */
- 	ret = dbp->stat (dbp,
-+#if BDB_VERSION > 40300
-+			 NULL,
-+#endif
- 			 &statp,
- #if BDB_VERSION < 40000
- 			 NULL,
- #endif
-+
- 			 0);
- 	if (ret != 0) {
- 		gda_connection_add_error (cnc, gda_bdb_make_error (ret));

Deleted: extra-x86_64/libgda.install
===================================================================
--- extra-x86_64/libgda.install	2009-04-20 20:31:09 UTC (rev 36247)
+++ extra-x86_64/libgda.install	2009-04-20 20:31:31 UTC (rev 36248)
@@ -1,16 +0,0 @@
-post_install() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-op=$1
-shift
-
-$op $*