Updated to 3.0.8

Include some suggestions from @Singularity

2 files changed, 21 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0306fbb319c2..f88bd0b3f6e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mariadb-connector-odbc
-	pkgdesc = MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API
-	pkgver = 3.0.6
+	pkgdesc = A standardized, LGPL licensed ODBC database driver for MariaDB
+	pkgver = 3.0.8
 	pkgrel = 1
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
@@ -11,12 +11,13 @@ pkgbase = mariadb-connector-odbc
 	makedepends = cmake
 	depends = unixodbc>=2.3
 	depends = openssl
+	depends = zlib
 	conflicts = mariadb-connector-odbc-bin
 	options = staticlibs
-	source = https://downloads.mariadb.org/interstitial/connector-odbc-3.0.6/mariadb-connector-odbc-3.0.6-ga-src.tar.gz
-	source = https://downloads.mariadb.org/interstitial/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz
-	sha256sums = 1b45b801774ea356f56ca7eb5dc5d58df8c0e61893c9f9901c4d716e34d5d71d
-	sha256sums = 2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48
+	source = https://downloads.mariadb.org/interstitial/connector-odbc-3.0.8/mariadb-connector-odbc-3.0.8-ga-src.tar.gz
+	source = https://downloads.mariadb.org/interstitial/connector-c-3.0.8/mariadb-connector-c-3.0.8-src.tar.gz
+	sha256sums = a7f3b735b94d69bdbb7a2debcd92a1d002fdf7e96781ce137e48bb40b4033c6a
+	sha256sums = 2ca368fd79e87e80497a5c9fd18922d8316af8584d87cecb35bd5897cb1efd05
 
 pkgname = mariadb-connector-odbc
 
diff --git a/PKGBUILD b/PKGBUILD
index 225f486a3b8f..cbba994ff8ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 pkgname=mariadb-connector-odbc
 conflicts=('mariadb-connector-odbc-bin')
-pkgver=3.0.6
+pkgver=3.0.8
 pkgrel=1
-pkgdesc="MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API"
+pkgdesc="A standardized, LGPL licensed ODBC database driver for MariaDB"
 arch=('x86_64' 'i686')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
 license=('LGPL')
-depends=('unixodbc>=2.3' 'openssl')
+depends=('unixodbc>=2.3' 'openssl' 'zlib')
 makedepends=('git' 'cmake')
 options=('staticlibs')
 source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
         "https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz")
 
-sha256sums=('1b45b801774ea356f56ca7eb5dc5d58df8c0e61893c9f9901c4d716e34d5d71d'
-            '2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48')
+sha256sums=('a7f3b735b94d69bdbb7a2debcd92a1d002fdf7e96781ce137e48bb40b4033c6a'
+            '2ca368fd79e87e80497a5c9fd18922d8316af8584d87cecb35bd5897cb1efd05')
 
 install=mariadb-connector-odbc.install
 
@@ -25,26 +25,25 @@ prepare() {
     cd ..
     rm -Rf build
     mkdir build
-    cd build
-    cmake ../$pkgname-$pkgver-ga-src \
-        -G"Unix Makefiles" \
-        -DWITH_OPENSSL=ON \
-        -DCMAKE_BUILD_TYPE=release \
-        -DCMAKE_INSTALL_PREFIX=/usr
 }
 
 build() {
     cd build
+    cmake \
+        -DCMAKE_BUILD_TYPE=RELEASE \
+        -DWITH_EXTERNAL_ZLIB=ON \
+        -DWITH_SQLITE=OFF \
+        -DWITH_OPENSSL=ON \
+        -DWITH_MYSQLCOMPAT=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
+        ../$pkgname-$pkgver-ga-src
     make
 }
 
 package() {
     cd build
     DESTDIR="$pkgdir" cmake -DCOMPONENT=ODBCLibs -P cmake_install.cmake
-    DESTDIR="$pkgdir" cmake -DCOMPONENT=Documentation -P cmake_install.cmake
     cd "$pkgdir"
-    mv usr/share/doc/{mariadb_connector_odbc,$pkgname}
     [ -d usr/lib64 ] && mv usr/lib64 usr/lib
-    mkdir -p usr/share/licenses/$pkgname
-    mv usr/share/doc/$pkgname/COPYING usr/share/licenses/$pkgname/COPYING
 }