[arch-commits] Commit in pgadmin3/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, January 14, 2014 @ 06:57:06
  Author: eric
Revision: 103959

upgpkg: pgadmin3 1.18.1-8

Build against wxgtk2.8 (close FS#38472)

Modified:
  pgadmin3/trunk/PKGBUILD
Deleted:
  pgadmin3/trunk/ChangeLog

-----------+
 ChangeLog |   28 ----------------------------
 PKGBUILD  |   17 +++++++++--------
 2 files changed, 9 insertions(+), 36 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2014-01-14 02:52:20 UTC (rev 103958)
+++ ChangeLog	2014-01-14 05:57:06 UTC (rev 103959)
@@ -1,28 +0,0 @@
-2008-08-21  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.8.5
-
-2008-06-24  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated for i686   - 1.8.4
-
-2008-02-21  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated for i686   - 1.8.2
-
-2008-01-05  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated for x86_64 - 1.8.1
-	* Updated for i686   - 1.8.1
-
-2007-10-28  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated version
-
-2007-10-11  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated version
-
-2007-06-28  tardo  <tardo at nagi-fanboi.net>
-	
-	* Built for x86_64

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-14 02:52:20 UTC (rev 103958)
+++ PKGBUILD	2014-01-14 05:57:06 UTC (rev 103959)
@@ -6,12 +6,12 @@
 
 pkgname=pgadmin3
 pkgver=1.18.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://www.pgadmin.org"
 license=('custom')
-depends=('wxgtk' 'postgresql-libs' 'libxslt')
+depends=('wxgtk2.8' 'postgresql-libs' 'libxslt')
 makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
 install=pgadmin3.install
 source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
@@ -22,17 +22,18 @@
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png
 
   cd "pgadmin3-${pkgver}"
-  [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=3.0
+  sed -i 's/wx-config/wx-config-2.8/' configure
+  [ -f Makefile ] ||  ./configure --prefix=/usr --with-wx-version=2.8
   make
 }
 
 package() {
-  cd $srcdir/pgadmin3-${pkgver}
+  cd "$srcdir"/pgadmin3-${pkgver}
 
-  make DESTDIR=$pkgdir/ install
-  install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pgAdmin3.ico
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 i18n/$pkgname.lng "$pkgdir/usr/share/pgadmin3/i18n"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 pgadmin/include/images/pgAdmin3.ico "$pkgdir/usr/share/pgadmin3/pgAdmin3.ico"
   install -Dm644 "$srcdir/pgadmin3-3.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
   install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }