bump

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62f24dcf2123..c7f2fdd29bf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blast+
 	pkgdesc = BLAST tool suite from NCBI (blastn, blastp, blastx, psiblast, etc)
-	pkgver = 2.11.0
+	pkgver = 2.12.0
 	pkgrel = 1
 	url = http://blast.ncbi.nlm.nih.gov/
 	arch = i686
@@ -15,9 +15,9 @@ pkgbase = blast+
 	conflicts = blast
 	conflicts = blast+-bin
 	conflicts = ncbi-blast
+	conflicts = proj
 	replaces = ncbi-blast
-	source = https://ftp.ncbi.nlm.nih.gov/blast/executables/LATEST/ncbi-blast-2.11.0+-src.tar.gz
-	sha256sums = d88e1858ae7ce553545a795a2120e657a799a6d334f2a07ef0330cc3e74e1954
+	source = https://ftp.ncbi.nlm.nih.gov/blast/executables/LATEST/ncbi-blast-2.12.0+-src.tar.gz
+	sha256sums = fda3c9c9d488cad6c1880a98a236d842bcf3610e3e702af61f7a48cf0a714b88
 
 pkgname = blast+
-
diff --git a/PKGBUILD b/PKGBUILD
index 71b103550d1c..897057edbe02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2034,SC2148,SC2154
 
 pkgname=blast+
-pkgver=2.11.0
+pkgver=2.12.0
 pkgrel=1
 pkgdesc="BLAST tool suite from NCBI (blastn, blastp, blastx, psiblast, etc)"
 arch=('i686' 'x86_64')
@@ -11,11 +11,12 @@ url="http://blast.ncbi.nlm.nih.gov/"
 license=('custom')
 depends=('lmdb' 'lzo' 'pcre' 'python')
 makedepends=('cpio')
-conflicts=('blast' 'blast+-bin' 'ncbi-blast')
+# conflicts with proj on libproj.so
+conflicts=('blast' 'blast+-bin' 'ncbi-blast' 'proj')
 provides=('blast')
 replaces=('ncbi-blast')
 source=("https://ftp.ncbi.nlm.nih.gov/blast/executables/LATEST/ncbi-blast-$pkgver+-src.tar.gz")
-sha256sums=('d88e1858ae7ce553545a795a2120e657a799a6d334f2a07ef0330cc3e74e1954')
+sha256sums=('fda3c9c9d488cad6c1880a98a236d842bcf3610e3e702af61f7a48cf0a714b88')
 
 prepare() {
     cd "$srcdir"/ncbi-blast-"$pkgver"+-src/c++ || exit