[arch-commits] Commit in scim/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, March 10, 2009 @ 19:53:47
  Author: eric
Revision: 29657

Merged revisions 13871,28124,29342,29656 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/scim/trunk

........
  r13871 | allan | 2008-09-29 02:21:06 -0400 (Mon, 29 Sep 2008) | 1 line
  
  correct sourceforge url
........
  r28124 | eric | 2009-02-27 19:08:01 -0500 (Fri, 27 Feb 2009) | 2 lines
  
  upgpkg: scim 1.4.8-1
      upstream update, fixed install scriptlet, changed gcc depends to gcc-libs
........
  r29342 | eric | 2009-03-08 00:11:39 -0500 (Sun, 08 Mar 2009) | 2 lines
  
  upgpkg: scim 1.4.8-2
      Added patch for java clients (close FS#12356)
........
  r29656 | eric | 2009-03-10 19:53:20 -0400 (Tue, 10 Mar 2009) | 2 lines
  
  upgpkg: scim 1.4.8-3
      Removed java patch. Scim 1.4.8 doesn't need it apparently (see FS#12356)
........

Modified:
  scim/repos/extra-x86_64/	(properties)
  scim/repos/extra-x86_64/PKGBUILD
  scim/repos/extra-x86_64/scim.install

--------------+
 PKGBUILD     |   35 ++++++++++++++---------------------
 scim.install |   19 ++-----------------
 2 files changed, 16 insertions(+), 38 deletions(-)


Property changes on: scim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /scim/trunk:1-9946
   + /scim/trunk:1-29656

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-10 23:53:20 UTC (rev 29656)
+++ extra-x86_64/PKGBUILD	2009-03-10 23:53:47 UTC (rev 29657)
@@ -1,32 +1,25 @@
 # $Id$
 # Maintainer: damir <damir at archlinux.org>
-# Contributer: Gan Lu <rhythm.gan at gmail.com>
+# Contributor: Gan Lu <rhythm.gan at gmail.com>
 
 pkgname=scim
-pkgver=1.4.7
-pkgrel=1
+pkgver=1.4.8
+pkgrel=3
 pkgdesc="A Input Method development platform"
 arch=("i686" "x86_64")
-depends=('gtk2' 'gcc')
-makedepends=('intltool')
-install=scim.install
 url="http://www.scim-im.org/projects/scim"
 license=('GPL')
-source=(http://puzzle.dl.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz)
-md5sums=('840dcfd4264a1443478c188ff747984e')
+depends=('gtk2' 'gcc-libs')
+makedepends=('intltool')
+options=('!libtool')
+install=scim.install
+source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz)
+md5sums=('c52da019d48df4ba44cbd01558203cc7')
 
 build() {
-     cd $startdir/src/$pkgname-$pkgver
-        ./configure --prefix=/usr\
-                    --sysconfdir=/etc\
-                    --with-gnu-ld \
-                    --with-x \
-                    --disable-config-gconf \
-                    --disable-static \
-                    # --enable-debug --enable-tests # use with --nostrip
-        make || return 1
-        make DESTDIR=$startdir/pkg install
-     # say goodbye to .la files:
-     find $startdir/pkg -name '*.la' -exec rm {} \;
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-gnu-ld --with-x --disable-static || return 1
+  make || return 1
+  make DESTDIR=$startdir/pkg install || return 1
 }
-

Modified: extra-x86_64/scim.install
===================================================================
--- extra-x86_64/scim.install	2009-03-10 23:53:20 UTC (rev 29656)
+++ extra-x86_64/scim.install	2009-03-10 23:53:47 UTC (rev 29657)
@@ -1,28 +1,13 @@
-# arg 1:  the new package version
 post_install() {
   echo -n "updating gtk.immodules... "
   /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
   echo "done."
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  /bin/true
+  post_install
 }
 
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
 post_remove() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
+  post_install
 }
-
-op=$1
-shift
-$op $*