[Frugalware-git] wipv: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

[VÖRÖSKŐI András]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=062e95a72e9a2133c7ce47005d9f7fee50e4ad55

commit 062e95a72e9a2133c7ce47005d9f7fee50e4ad55
Merge: f566f3f 9d69237
Author: VÖRÖSKŐI András <voros...@frugalware.org>
Date:   Tue Jun 29 14:56:39 2010 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/devel/ruby/FrugalBuild
pull in ruby changes from current

diff --cc source/devel/ruby/FrugalBuild
index ed9ea46,350b35b..be944db
--- a/source/devel/ruby/FrugalBuild
+++ b/source/devel/ruby/FrugalBuild
@@@ -5,10 -5,10 +5,10 @@@
pkgname=ruby
pkgver=1.9.1
pkgpatch=378
--pkgrel=3
++pkgrel=4
pkgdesc="An object-oriented programming language."
url="http://www.ruby-lang.org/";
-depends=('termcap' 'zlib' 'db>=4.7.25-2' 'readline' 'openssl' 'gdbm')
+depends=('termcap' 'zlib' 'db>=4.7.25-2' 'readline' 'openssl>=1.0.0' 'gdbm')
makedepends=('tk')
groups=('devel')
archs=('i686' 'x86_64' 'ppc')

_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git