[arch-commits] Commit in eric4/trunk (ChangeLog PKGBUILD eric4.install)

[Evgeniy Alekseev]

    Date: Sunday, October 5, 2014 @ 22:09:42
  Author: arcanis
Revision: 120184

upgpkg: eric4 4.5.25-1

Added:
  eric4/trunk/ChangeLog
Modified:
  eric4/trunk/PKGBUILD
  eric4/trunk/eric4.install

---------------+
 ChangeLog     |    2 ++
 PKGBUILD      |   30 ++++++++++++++++--------------
 eric4.install |    5 ++---
 3 files changed, 20 insertions(+), 17 deletions(-)

Added: ChangeLog
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2014-10-05 20:09:42 UTC (rev 120184)
@@ -0,0 +1,2 @@
+4.5.25-1:
+upstream update. Create eric-common package

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-05 20:07:28 UTC (rev 120183)
+++ PKGBUILD	2014-10-05 20:09:42 UTC (rev 120184)
@@ -1,33 +1,35 @@
 # $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Contributor: Ray Rashif <schiv at archlinux dot org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux dot us>
 # See .contrib for older/other contributors
 
 pkgname=eric4
-pkgver=4.5.24
+pkgver=4.5.25
 pkgrel=1
 pkgdesc="A full-featured Python 2.x and Ruby IDE in PyQt4"
 arch=('any')
 url="http://eric-ide.python-projects.org/"
 license=('GPL3')
-depends=('python2-qscintilla')
-conflicts=('eric<5')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/eric-ide/$pkgname-$pkgver.tar.gz"
-        "$pkgname.desktop")
-md5sums=('b41afbcfc59ec00441742a1495e06a6b'
+depends=('eric-common' 'python2-qscintilla')
+install=${pkgname}.install
+source=("http://downloads.sourceforge.net/eric-ide/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}.desktop")
+md5sums=('f68cdadacfa10298c89300e0c4036324'
          'bce515b66a2c63dfc76a0f92edbe2ecb')
+changelog=ChangeLog
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
   python2 install.py -c -b /usr/bin -i "$pkgdir"
+  # remove common components
+  find "${pkgdir}/usr/share/qt4/qsci/api/" -type f -not -name 'eric*' -exec rm {} \;
 
   # freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+                 "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -Dm644 eric/icons/default/eric.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+                 "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
 
 # vim:set ts=2 sw=2 et:

Modified: eric4.install
===================================================================
--- eric4.install	2014-10-05 20:07:28 UTC (rev 120183)
+++ eric4.install	2014-10-05 20:09:42 UTC (rev 120184)
@@ -1,10 +1,9 @@
 post_install() {
-	echo "  > Updating desktop mime database..."
-	update-desktop-database -q
+    update-desktop-database -q
 }
 
 post_upgrade() {
-	post_install
+    post_install
 }
 
 # vim:set ts=2 sw=2 et: