[arch-commits] Commit in words/repos (3 files)
Eric Bélanger
eric at archlinux.org
Tue Apr 21 00:23:32 UTC 2009
Date: Monday, April 20, 2009 @ 20:23:32
Author: eric
Revision: 36319
Fixed svn conflict
Modified:
words/repos/extra-x86_64/ (properties)
words/repos/extra-x86_64/PKGBUILD
words/repos/extra-x86_64/words.install
---------------+
PKGBUILD | 41 +++++++++++++++++++++++++----------------
words.install | 14 --------------
2 files changed, 25 insertions(+), 30 deletions(-)
Property changes on: words/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /words/trunk:1
+ /words/trunk:1-36318
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-04-21 00:17:35 UTC (rev 36318)
+++ extra-x86_64/PKGBUILD 2009-04-21 00:23:32 UTC (rev 36319)
@@ -1,27 +1,36 @@
# $Id$
-# Maintainer: eric <eric at archlinux.org>
# Contributor: Eric Johnson <eric at coding-zone.com>
pkgname=words
-pkgver=1.0
-pkgrel=4
+pkgver=2.0
+pkgrel=1
pkgdesc="A collection of International 'words' files for /usr/share/dict"
-arch=(i686 x86_64)
-depends=('util-linux')
-source=(http://www.coding-zone.com/$pkgname-$pkgver.tar.gz)
-install=$pkgname.install
-url="http://www.coding-zone.com/words.phtml"
-md5sums=('0877eb863da984003a931cee7fd3aaad')
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org"
+license=('GPL' 'GPL2' 'custom')
+depends=('util-linux-ng')
+install=words.install
+source=(ftp://ftp.archlinux.org/other/words/$pkgname-$pkgver.tar.bz2)
+md5sums=('cc73f9dd1fb5fb358badcfc23f7963bf')
build() {
- cd $startdir/src
- /bin/mkdir -p $startdir/pkg/usr/share/dict
- /bin/cp * $startdir/pkg/usr/share/dict
- /bin/rm $startdir/pkg/usr/share/dict/README
- /bin/rm $startdir/pkg/usr/share/dict/*.tar.gz
+ cd $srcdir/$pkgname-$pkgver
+ install -d $pkgdir/usr/share/dict
+ install -m644 dict/* $pkgdir/usr/share/dict || return 1
+
+ ln -s catala $pkgdir/usr/share/dict/catalan
+ ln -s british-english $pkgdir/usr/share/dict/british
+ ln -s american-english $pkgdir/usr/share/dict/usa
+ ln -s ogerman $pkgdir/usr/share/dict/german
+
# create empty place holder - this will be replaced with a
# symlink pointing to the locale's lang during install
#
- /bin/touch $startdir/pkg/usr/share/dict/words
+ touch $pkgdir/usr/share/dict/words
+
+ # Licenses:
+ cd doc
+ for i in * ; do
+ install -D -m644 $i/copyright ${pkgdir}/usr/share/licenses/${pkgname}/$i.copyright
+ done
}
-# vim: ts=2 sw=2 et ft=sh
Modified: extra-x86_64/words.install
===================================================================
--- extra-x86_64/words.install 2009-04-21 00:17:35 UTC (rev 36318)
+++ extra-x86_64/words.install 2009-04-21 00:23:32 UTC (rev 36319)
@@ -1,4 +1,3 @@
-# arg 1: the new package version
post_install() {
# grab the first part of LANG
#
@@ -63,19 +62,6 @@
unset ins_lchk ins_i ins_indx ins_lang ins_langs
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
post_install $1
}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-op=$1
-shift
-
-$op $*
-# vim: ts=2 sw=2 et ft=sh
More information about the arch-commits
mailing list