Added support for Solr 6.x and updated to latest upstream release.

2 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1320f45eb02..5d5898bda4fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Dec  8 09:57:18 UTC 2015
 pkgbase = solr-conf-drupal
 	pkgdesc = Configuration files to enable Drupal 7.x or 8.x to use Solr 3.x, 4.x, or 5.x as its search provider
-	pkgver = 20151208
+	pkgver = 20160708
 	pkgrel = 1
 	url = http://drupal.org/project/search_api_solr
 	arch = any
@@ -12,15 +10,18 @@ pkgbase = solr-conf-drupal
 	optdepends = drupal: Solr client for these configuration files
 	optdepends = aegir: meta-Drupal hosting platform
 	optdepends = solr-undertow: high performance servlet container for Solr
-	noextract = https://raw.githubusercontent.com/apache/lucene-solr/branch_5x/solr/core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt
-	noextract = http://ftp.drupal.org/files/projects/search_api_solr-7.x-1.9.tar.gz
-	noextract = http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.0-alpha1.tar.gz
-	source = https://raw.githubusercontent.com/apache/lucene-solr/branch_5x/solr/core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt
-	source = http://ftp.drupal.org/files/projects/search_api_solr-7.x-1.9.tar.gz
-	source = http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.0-alpha1.tar.gz
+	noextract = https://raw.githubusercontent.com/apache/lucene-solr/master/solr/example/example-DIH/solr/solr/mapping-ISOLatin1Accent.txt
+	noextract = https://www.drupal.org/files/issues/2711685-support-solr6-search-api-solr-4.patch
+	noextract = http://ftp.drupal.org/files/projects/search_api_solr-7.x-1.11.tar.gz
+	noextract = http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.0-alpha5.tar.gz
+	source = https://raw.githubusercontent.com/apache/lucene-solr/master/solr/example/example-DIH/solr/solr/mapping-ISOLatin1Accent.txt
+	source = https://www.drupal.org/files/issues/2711685-support-solr6-search-api-solr-4.patch
+	source = http://ftp.drupal.org/files/projects/search_api_solr-7.x-1.11.tar.gz
+	source = http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.0-alpha5.tar.gz
 	md5sums = 9f3c8a60a4f09327fad22aeff082c2b3
-	md5sums = 0293cb23527acb1e8a307539a8d68021
-	md5sums = 40fccb08f08b0014ff884504ddb7616c
+	md5sums = 479dea32043f12575838eaa6de62f248
+	md5sums = a8b60845919774521861bdfbe7883a11
+	md5sums = 1a2636b8050903114b66ce300c99b50d
 
 pkgname = solr-conf-drupal
 
diff --git a/PKGBUILD b/PKGBUILD
index 52b7444e7d01..ed43edb54a97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=solr-conf-drupal
 _pkgname=search_api_solr
-pkgver=20151208
-_pkgvers=(7.x-1.9
-          8.x-1.0-alpha1)
+pkgver=20160708
+_pkgvers=(7.x-1.11
+          8.x-1.0-alpha5)
 pkgrel=1
 pkgdesc="Configuration files to enable Drupal 7.x or 8.x to use Solr 3.x, 4.x, or 5.x as its search provider"
 arch=('any')
@@ -16,15 +16,14 @@ optdepends=(
   'aegir: meta-Drupal hosting platform'
   'solr-undertow: high performance servlet container for Solr')
 # The mapping-ISOLatin1Accent.txt file is identical in all occurrences in the Solr repo across the head of all its supported branches (3-5.x)
-source=("https://raw.githubusercontent.com/apache/lucene-solr/master/solr/example/example-DIH/solr/solr/ "
-        "https://www.drupal.org/files/issues/2711685-support-solr6-3.patch"
-         '0293cb23527acb1e8a307539a8d68021'
+source=("https://raw.githubusercontent.com/apache/lucene-solr/master/solr/example/example-DIH/solr/solr/mapping-ISOLatin1Accent.txt"
         "https://www.drupal.org/files/issues/2711685-support-solr6-${_pkgname//_/-}-4.patch"
         "http://ftp.drupal.org/files/projects/$_pkgname-${_pkgvers[0]}.tar.gz"
         "http://ftp.drupal.org/files/projects/$_pkgname-${_pkgvers[1]}.tar.gz")
-md5sums=('f33510d7ab9f75bc8dc5e49d72acea2a'
+md5sums=('9f3c8a60a4f09327fad22aeff082c2b3'
          '479dea32043f12575838eaa6de62f248'
-         '40fccb08f08b0014ff884504ddb7616c')
+         'a8b60845919774521861bdfbe7883a11'
+         '1a2636b8050903114b66ce300c99b50d')
 noextract=("${source[@]%%::*}")
 
 prepare() {
@@ -33,6 +32,7 @@ prepare() {
     ver_drupal="${_pkgver%%-*}"
     install -dm755 "$ver_drupal"
     tar --extract --file="$_pkgname-$_pkgver.tar.gz" --strip-components=1 --directory="$ver_drupal" --overwrite
+    [ "$ver_drupal" = "8.x" ] || patch --strip=1 --directory=$ver_drupal < "2711685-support-solr6-${_pkgname//_/-}-4.patch"
   done
 }