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

[andyrtr at archlinux.org]

    Date: Friday, December 12, 2008 @ 16:22:36
  Author: andyrtr
Revision: 21407

Merged revisions 21404,21406 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gcin/trunk

........
  r21404 | andyrtr | 2008-12-12 21:15:59 +0000 (Fr, 12 Dez 2008) | 2 lines
  
  upgpkg: gcin 1.4.2-1
      new version 1.4.2; fix 64bit libdir location and linking; fixed the install file
........
  r21406 | andyrtr | 2008-12-12 21:18:35 +0000 (Fr, 12 Dez 2008) | 1 line
  
  add the lidir fix patch
........

Added:
  gcin/repos/extra-i686/fix_x86_64_libdir.patch
    (from rev 21406, gcin/trunk/fix_x86_64_libdir.patch)
Modified:
  gcin/repos/extra-i686/	(properties)
  gcin/repos/extra-i686/PKGBUILD
  gcin/repos/extra-i686/gcin.install

-------------------------+
 PKGBUILD                |   24 ++++++++----------------
 fix_x86_64_libdir.patch |   11 +++++++++++
 gcin.install            |   14 +-------------
 3 files changed, 20 insertions(+), 29 deletions(-)


Property changes on: gcin/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gcin/trunk:1-3112
   + /gcin/trunk:1-21406

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-12 21:18:35 UTC (rev 21406)
+++ extra-i686/PKGBUILD	2008-12-12 21:22:36 UTC (rev 21407)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=gcin
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="Traditional Chinese Input Method Server for X window system (XIM)"
 arch=("i686" "x86_64")
@@ -11,25 +11,17 @@
 url="http://www.csie.nctu.edu.tw/~cp76/gcin/"
 depends=('gtk2' 'libxtst' 'bash')
 install=gcin.install
-source=(http://cle.linux.org.tw/gcin/download/$pkgname-$pkgver.tar.bz2 \
-	gcin.install)
+source=(http://cle.linux.org.tw/gcin/download/$pkgname-$pkgver.tar.bz2
+	fix_x86_64_libdir.patch)
 options=('!makeflags')
+md5sums=('86367f1408bcf0a0428e4130003d2174'
+         '2018737a07a0a7a9e0c28e11245dde14')
 
 build() {
     cd $startdir/src/$pkgname-$pkgver
+    patch -Np0 -i ${srcdir}/fix_x86_64_libdir.patch || return 1
     ./configure --prefix=/usr
-    make -C im-client
     make || return 1
-    make prefix=$startdir/pkg/usr \
-         datadir=$startdir/pkg/usr/share \
-         bindir=$startdir/pkg/usr/bin \
-         libdir=$startdir/pkg/usr/lib \
-         includedir=$startdir/pkg/usr/include \
-         man1dir=$startdir/pkg/usr/share/man/man1 \
-        install
+    make DESTDIR=${pkgdir} install || return 1
 }
 
-
-
-md5sums=('9b6f03c5f014b0251c05440502a0e5b2'
-         '3c58b3d1258d1bec593c5312aeb81311')

Copied: gcin/repos/extra-i686/fix_x86_64_libdir.patch (from rev 21406, gcin/trunk/fix_x86_64_libdir.patch)
===================================================================
--- extra-i686/fix_x86_64_libdir.patch	                        (rev 0)
+++ extra-i686/fix_x86_64_libdir.patch	2008-12-12 21:22:36 UTC (rev 21407)
@@ -0,0 +1,11 @@
+--- configure	2008-01-11 01:00:35.000000000 +0000
++++ configure.new	2008-12-12 21:06:41.064992082 +0000
+@@ -108,7 +108,7 @@
+ 
+ LIB='lib'
+ if [ -d /lib64 ]; then
+-LIB='lib64'
++LIB='lib'
+ fi
+ 
+ QT_IM='N'

Modified: extra-i686/gcin.install
===================================================================
--- extra-i686/gcin.install	2008-12-12 21:18:35 UTC (rev 21406)
+++ extra-i686/gcin.install	2008-12-12 21:22:36 UTC (rev 21407)
@@ -1,28 +1,16 @@
-# 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 $1
 }
 
-# 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."
 }
 
-op=$1
-shift
-$op $*