summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2010-02-12 18:13:20 +0000
committerJohannes Dewender2010-02-12 18:13:20 +0000
commitb4b7b82f7c1eb4603d2efda7ac1a9ef62f27e565 (patch)
tree9319ce84d9bc921ee12d3695d6a32c0bd1d12ba9
parent31dacdee1d6549abb83bb8c098717de19919294a (diff)
downloadaur-b4b7b82f7c1eb4603d2efda7ac1a9ef62f27e565.tar.gz
ruby-svn: force-update und conflicts ruby
git-svn-id: http://svn.kraehen.org/aur@24 04e22907-73ef-438a-a52f-a971dc6d3b47
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
2 files changed, 11 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f8e37b3f149..ba5fad2a31ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ruby-svn
pkgdesc = A dynamic, open source programming language with a focus on simplicity and productivity.
- pkgver = 26650
+ pkgver = 26652
pkgrel = 1
url = http://www.ruby-lang.org/en/
arch = i686
@@ -14,6 +14,8 @@ pkgbase = ruby-svn
depends = openssl
depends = zlib
depends = readline
+ provides = ruby=1.9.2
+ conflicts = ruby
pkgname = ruby-svn
diff --git a/PKGBUILD b/PKGBUILD
index 3484dbe53b1a..526bb5f28ca7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Contributor: kamu <mr.kamu@gmail.com>
pkgname=ruby-svn
-pkgver=26650
+pkgver=26652
pkgrel=1
pkgdesc="A dynamic, open source programming language with a focus on simplicity and productivity."
arch=(i686 x86_64)
@@ -8,6 +8,8 @@ url="http://www.ruby-lang.org/en/"
license="Ruby"
depends=('glibc' 'gdbm' 'db' 'openssl' 'zlib' 'readline')
makedepends=('subversion' 'autoconf')
+conflicts=('ruby')
+provides=('ruby=1.9.2')
source=()
md5sums=()
@@ -21,16 +23,17 @@ build() {
cd $startdir/src/
if [ -d $_svnmod ]; then
cd $_svnmod
- svn update -r $pkgver
+ svn update --force -r $pkgver
else
svn co $_svntrunk $_svnmod
cd $_svnmod
fi
autoconf
- ./configure --prefix=/usr --enable-shared --enable-pthread \
- --program-suffix=${_suffix} --with-ruby-version=${_version} \
- --with-soname=ruby${_suffix}
+ ./configure --prefix=/usr --enable-shared --enable-pthread
+ #./configure --prefix=/usr --enable-shared --enable-pthread \
+ #--program-suffix=${_suffix} --with-ruby-version=${_version} \
+ #--with-soname=ruby${_suffix}
make || return 1
make DESTDIR=${startdir}/pkg install || return 1
make DESTDIR=${startdir}/pkg install-doc || return 1