From 0619ce4c5b31f9ee84e8f67da79d611880d50fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Dor=C5=88=C3=A1k?= <jdornak@redhat.com>
Date: Wed, 3 Feb 2016 12:49:50 +0100
Subject: [PATCH] Update to 10.1.11

---
 .gitignore            | 1 +
 mariadb-scripts.patch | 8 ++++----
 mariadb.spec          | 7 ++++++-
 sources               | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 745d740..62e7565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /mariadb-10.0.21.tar.gz
 /mariadb-10.1.8.tar.gz
 /mariadb-10.1.10.tar.gz
+/mariadb-10.1.11.tar.gz
diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index 43674d7..9b2446a 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -1,6 +1,6 @@
---- mariadb-10.1.8/scripts/CMakeLists.txt.systemd	2015-10-15 17:43:45.000000000 +0200
-+++ mariadb-10.1.8/scripts/CMakeLists.txt	2015-10-21 17:39:41.179737915 +0200
-@@ -323,6 +323,33 @@ ELSE()
+--- mariadb-10.1.11.orig/scripts/CMakeLists.txt	2016-01-28 13:12:51.000000000 +0100
++++ mariadb-10.1.11/scripts/CMakeLists.txt	2016-02-03 12:46:26.306109293 +0100
+@@ -320,6 +320,33 @@ ELSE()
        COMPONENT ${${file}_COMPONENT}
       )
    ENDFOREACH()
@@ -33,4 +33,4 @@
 +  ENDFOREACH()
  ENDIF()
  
- # Install libgcc as  mylibgcc.a
+ # Configure two scripts from one 'in' file.
diff --git a/mariadb.spec b/mariadb.spec
index d7e8b40..1264127 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -112,7 +112,7 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.1
-%global bugfixver 10
+%global bugfixver 11
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
@@ -1001,6 +1001,7 @@ fi
 %{_bindir}/aria_ftdump
 %{_bindir}/aria_pack
 %{_bindir}/aria_read_log
+%{_bindir}/maria_add_gis_sp.sql
 %{_bindir}/myisamchk
 %{_bindir}/myisam_ftdump
 %{_bindir}/myisamlog
@@ -1033,6 +1034,7 @@ fi
 %{?with_tokudb:%{_bindir}/tokuft_logprint}
 
 %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
+%config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf
 %{?with_tokudb:%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf}
 
 %{_libexecdir}/mysqld
@@ -1169,6 +1171,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb  3 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.11-1
+- Update to 10.1.11
+
 * Tue Jan 19 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.10-1
 - Update to 10.1.10
 
diff --git a/sources b/sources
index 4bf4ebc..a78b5f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9aa4d68b24c1ddd8cb56923a920684b3  mariadb-10.1.10.tar.gz
+c199608ae4282f16007dc8c270ff2439  mariadb-10.1.11.tar.gz