Bump to upstream relase v2.6.0 and remove Python 2 package

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3c37d0a15ee..1169d709a0fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = viennarna
 	pkgdesc = RNA Secondary Structure Prediction and Comparison
-	pkgver = 2.5.1
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = http://www.tbi.univie.ac.at/RNA
 	arch = x86_64
@@ -8,16 +8,18 @@ pkgbase = viennarna
 	groups = viennarna-package
 	license = Custom
 	makedepends = perl
-	makedepends = python2
 	makedepends = python
 	makedepends = libtool
 	makedepends = check
 	makedepends = mpfr
 	makedepends = gsl
+	makedepends = lapack
+	makedepends = lapacke
+	makedepends = gcc-fortran
 	options = staticlibs
 	options = !strip
-	source = http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.5.1.tar.gz
-	sha256sums = 05400437cf15595e10b1a25df6c9c48856f356130f9d1e380fa8866b6d27f457
+	source = http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-2.6.0.tar.gz
+	sha256sums = c239596ac63ff30d98c7629f3cfeaa6a066dc3b577e1b920eb704381bb6c3f85
 
 pkgname = viennarna
 	depends = perl
@@ -27,17 +29,14 @@ pkgname = viennarna
 	provides = Kinfold=1.4
 	provides = RNAforester=2.0
 	provides = kinwalker=2.0
-	provides = viennarna2=2.5.1
-	provides = libRNA=2.5.1
+	provides = RNAxplorer=0.9
+	provides = viennarna2=2.6.0
+	provides = libRNA=2.6.0
 
 pkgname = python-rna
 	depends = python
-	depends = viennarna=2.5.1
-
-pkgname = python2-rna
-	depends = python2
-	depends = viennarna=2.5.1
+	depends = viennarna=2.6.0
 
 pkgname = perl-rna
 	depends = perl
-	depends = viennarna=2.5.1
+	depends = viennarna=2.6.0
diff --git a/PKGBUILD b/PKGBUILD
index 016eb21be63c..09e4648de470 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Ronny Lorenz <ronny at tbi dot univie dot ac dot at>
 
 pkgbase=viennarna
-pkgname=('viennarna' 'python-rna' 'python2-rna' 'perl-rna')
-pkgver=2.5.1
+pkgname=('viennarna' 'python-rna' 'perl-rna')
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="RNA Secondary Structure Prediction and Comparison"
 arch=('x86_64' 'i686')
@@ -10,16 +10,19 @@ license=('Custom')
 url="http://www.tbi.univie.ac.at/RNA"
 groups=('viennarna-package')
 makedepends=( 'perl'
-              'python2'
               'python'
               'libtool'
               'check'
               'mpfr'
-              'gsl')
+              'gsl'
+              'lapack'
+	      'lapacke'
+              'gcc-fortran')
+
 source=(http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-${pkgver}.tar.gz)
 
 options=('staticlibs' '!strip')
-sha256sums=('05400437cf15595e10b1a25df6c9c48856f356130f9d1e380fa8866b6d27f457')
+sha256sums=('c239596ac63ff30d98c7629f3cfeaa6a066dc3b577e1b920eb704381bb6c3f85')
 
 prepare() {
   cd "${srcdir}/ViennaRNA-${pkgver}"
@@ -49,6 +52,7 @@ package_viennarna() {
   provides=('Kinfold=1.4'
             'RNAforester=2.0'
             'kinwalker=2.0'
+	    'RNAxplorer=0.9'
             "viennarna2=${pkgver}"
             "libRNA=${pkgver}")
   conflict=('kinwalker')
@@ -71,6 +75,8 @@ package_viennarna() {
   make DESTDIR="${pkgdir}" install
   cd ../RNAlocmin
   make DESTDIR="${pkgdir}" install
+  cd ../RNAxplorer
+  make DESTDIR="${pkgdir}" install
   cd ../..
 
   # install library and header files
@@ -104,13 +110,6 @@ package_viennarna() {
   rm $pkgdir/usr/share/info/dir
 }
 
-package_python2-rna() {
-  depends=('python2' viennarna="${pkgver}")
-  cd "${srcdir}/ViennaRNA-${pkgver}"
-  cd interfaces/Python2
-  make DESTDIR="${pkgdir}" install
-}
-
 package_python-rna() {
   depends=('python' viennarna="${pkgver}")
   cd "${srcdir}/ViennaRNA-${pkgver}"