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

[Sergej Pupykin]

    Date: Friday, January 8, 2016 @ 19:15:58
  Author: spupykin
Revision: 155728

upgpkg: pgadmin3 1.22.0-1

upd

Modified:
  pgadmin3/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-08 18:02:11 UTC (rev 155727)
+++ PKGBUILD	2016-01-08 18:15:58 UTC (rev 155728)
@@ -5,8 +5,8 @@
 # Contributor: bekks <eduard.warkentin at gmx.de>
 
 pkgname=pgadmin3
-pkgver=1.20.0
-pkgrel=6
+pkgver=1.22.0
+pkgrel=1
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://www.pgadmin.org"
@@ -14,10 +14,8 @@
 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
-	0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
-md5sums=('3ca39fb598d0866eca90d30b85d5d5c4'
-         '69fbfdfe1bac75d7d1cdfeacd322cf5d')
+source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
+md5sums=('18b34f355f0ee5df762b08b5e51a121e')
 
 prepare() {
   cd "$srcdir"
@@ -26,8 +24,6 @@
   cd "pgadmin3-${pkgver}"
   sed -i 's/wx-config/wx-config-2.8/' configure
   sed -i 's/wxrc/wxrc-2.8/g' stringextract pgadmin/ui/embed-xrc
-
-  patch -p1 <$srcdir/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
 }
 
 build() {
@@ -44,11 +40,11 @@
   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 "$srcdir/pgAdmin3-1.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
 
-  install -Dm644 "$srcdir/pgAdmin3-5.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
-  install -Dm644 "$srcdir/pgAdmin3-4.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
-  install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+  install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+  install -Dm644 "$srcdir/pgAdmin3-2.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+  install -Dm644 "$srcdir/pgAdmin3-1.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
 
   install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }