new upstream 1.0.12

4 files changed, 16 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74cfac1e2cee..dd4e72b8ea5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
+# Generated by mksrcinfo v8
+# Sat Feb 20 14:20:58 UTC 2016
 pkgbase = holland
-	pkgver = 1.0.10
-	pkgrel = 5
+	pkgver = 1.0.12
+	pkgrel = 1
 	url = http://hollandbackup.org
-	changelog = holland.archlog
 	arch = any
 	license = BSD
 	license = GPL2
 	makedepends = python2-setuptools
 	options = emptydirs
-	source = http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
+	source = http://hollandbackup.org/releases/stable/1.0/holland-1.0.12.tar.gz
 	source = holland.logrotate
-	source = holland-1.0.10-cursor.patch
-	md5sums = 3435350d5c9dd57102e8b0470cd636c0
+	md5sums = ad86805874f2a0e77da3b926a3deb2ee
 	md5sums = 5b2d292dc7e1139fde8ab9439b0464ee
-	md5sums = 765146149bd193c1deb57675695d4680
 
 pkgname = holland
 	pkgdesc = Pluggable backup framework focusing on databases
@@ -26,13 +25,13 @@ pkgname = holland
 pkgname = holland-common
 	pkgdesc = Common library functionality for Holland Plugins
 	license = GPL2
-	depends = holland=1.0.10
+	depends = holland=1.0.12
 	depends = mysql-python
 
 pkgname = holland-mysqldump
 	pkgdesc = Logical mysqldump backup plugin for Holland
 	license = GPL2
-	depends = holland-common=1.0.10
+	depends = holland-common=1.0.12
 	depends = mariadb-clients
 	depends = mysql-python
 	backup = etc/holland/providers/mysqldump.conf
@@ -40,7 +39,7 @@ pkgname = holland-mysqldump
 pkgname = holland-mysqllvm
 	pkgdesc = Holland LVM snapshot backup plugin for MySQL
 	license = GPL2
-	depends = holland-common=1.0.10
+	depends = holland-common=1.0.12
 	depends = lvm2
 	depends = tar
 	depends = mysql-python
@@ -50,14 +49,14 @@ pkgname = holland-mysqllvm
 pkgname = holland-pgdump
 	pkgdesc = Holland Backup Provider for PostgreSQL
 	license = GPL2
-	depends = holland-common=1.0.10
+	depends = holland-common=1.0.12
 	depends = python2-psycopg2
 	backup = etc/holland/providers/pgdump.conf
 
 pkgname = holland-xtrabackup
 	pkgdesc = Xtrabackup plugin for Holland
 	license = GPL2
-	depends = holland-common=1.0.10
+	depends = holland-common=1.0.12
 	depends = xtrabackup
 	backup = etc/holland/providers/xtrabackup.conf
 
diff --git a/PKGBUILD b/PKGBUILD
index f6ef5f2d760d..6ed3bcee39b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,21 @@
 pkgbase=holland
 pkgname=('holland' 'holland-common' 'holland-mysqldump' 'holland-mysqllvm'
          'holland-pgdump' 'holland-xtrabackup')
-pkgver=1.0.10
-pkgrel=5
-changelog=holland.archlog
+pkgver=1.0.12
+pkgrel=1
 arch=('any')
 url="http://hollandbackup.org"
 license=('BSD' 'GPL2')
 options=('emptydirs')
 makedepends=('python2-setuptools')
 source=("http://hollandbackup.org/releases/stable/1.0/${pkgbase}-${pkgver}.tar.gz"
-        "holland.logrotate"
-        "holland-1.0.10-cursor.patch")
-md5sums=('3435350d5c9dd57102e8b0470cd636c0'
-         '5b2d292dc7e1139fde8ab9439b0464ee'
-         '765146149bd193c1deb57675695d4680')
+        "holland.logrotate")
+md5sums=('ad86805874f2a0e77da3b926a3deb2ee'
+         '5b2d292dc7e1139fde8ab9439b0464ee')
 
 prepare() {
   cd "${srcdir}"
   find -name setup.cfg -delete
-  patch -p0 < holland-1.0.10-cursor.patch
 }
 
 build() {
@@ -78,7 +74,6 @@ package_holland() {
     "${pkgdir}/usr/share/doc/holland/README.plugins"
   install -Dm0644 config/providers/README \
     "${pkgdir}/usr/share/doc/holland/README.providers"
-  install -Dm0644 CHANGES.txt "${pkgdir}/usr/share/doc/holland/CHANGES.txt"
   install -Dm0644 INSTALL "${pkgdir}/usr/share/doc/holland/INSTALL"
   install -Dm0644 README "${pkgdir}/usr/share/doc/holland/README"
   install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/holland/LICENSE"
diff --git a/holland-1.0.10-cursor.patch b/holland-1.0.10-cursor.patch
deleted file mode 100644
index e77bc1a9faea..000000000000
--- a/holland-1.0.10-cursor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- holland-1.0.10/plugins/holland.lib.mysql/holland/lib/mysql/client/base.py.orig	2013-07-29 16:49:37.000000000 -0500
-+++ holland-1.0.10/plugins/holland.lib.mysql/holland/lib/mysql/client/base.py	2014-12-11 21:36:42.154264669 -0600
-@@ -178,7 +178,7 @@
-                "LEFT JOIN INFORMATION_SCHEMA.ENGINES USING (ENGINE) "
-                "WHERE TABLE_SCHEMA = %s")
-         cursor = self.cursor()
--        cursor.execute(sql, (database))
-+        cursor.execute(sql, (database,))
-         names = [info[0] for info in cursor.description]
-         all_rows = cursor.fetchall()
-         result = [dict(zip(names, row)) for row in all_rows]
diff --git a/holland.archlog b/holland.archlog
deleted file mode 100644
index affd50775ebf..000000000000
--- a/holland.archlog
+++ /dev/null
@@ -1,20 +0,0 @@
-2014-12-13 Troy Engel <troyengel+arch@gmail.com>
-	* 1.0.10-4
-	Update depends of children to require same version as parent
-
-2014-12-13 Troy Engel <troyengel+arch@gmail.com>
-	* 1.0.10-4
-	Fix BSD license location, stop including GPL2 licenses
-
-2014-12-12 Troy Engel <troyengel+arch@gmail.com>
-	* 1.0.10-3
-	Peer review changes for better PKGBUILD
-	Move logrotate to a source file
-
-2014-12-11 Troy Engel <troyengel+arch@gmail.com>
-	* 1.0.10-2
-	Create patch for MySQL cursor.execute() bug (fixed upstream)
-
-2014-12-11 Troy Engel <troyengel+arch@gmail.com>
-	* 1.0.10-1
-	Initial release