@@ -1,6 +1,6 @@

 Summary:        Database servers made by the original developers of MySQL.

 Name:           mariadb

-Version:        10.1.24

+Version:        10.2.8

 Release:        1%{?dist}

 License:        GPLv2

 Group:          Applications/Databases

@@ -8,112 +8,348 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Url:            https://mariadb.org/

 Source0:        http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz

-%define         sha1 mariadb=77bf12f253bc4397fa0379dcdba81ae8f6f03d17

+%define         sha1 mariadb=80dcd455986eec254fc81b6bbedd4a542e8af495

 BuildRequires:  cmake

 BuildRequires:  Linux-PAM

 BuildRequires:  openssl-devel

 BuildRequires:  zlib-devel

 BuildRequires:  ncurses-devel

-

+BuildRequires:  krb5

+BuildRequires:  e2fsprogs-devel

+BuildRequires:  systemd

+BuildRequires:  curl

+BuildRequires:  libxml2-devel

+Conflicts:      mysql

 %description

 MariaDB Server is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, WordPress.com and Google.

 MariaDB turns data into structured information in a wide array of applications, ranging from banking to websites. It is an enhanced, drop-in replacement for MySQL. MariaDB is used because it is fast, scalable and robust, with a rich ecosystem of storage engines, plugins and many other tools make it very versatile for a wide variety of use cases.

-%package devel

-Summary:        Development headers for mariadb

-Requires:       %{name} = %{version}-%{release}

+%package          server

+Summary:          MariaDB server

+Requires:         %{name}-errmsg = %{version}-%{release}

+%description      server

+The MariaDB server and related files

+

+%package          server-galera

+Summary:          MariaDB Galera Cluster is a synchronous multi-master cluster for MariaDB

+Group:            Applications/Databases

+Requires:         %{name}-server = %{version}-%{release}

+

+%description      server-galera

+MariaDB Galera Cluster is a synchronous multi-master cluster for MariaDB. It is available on Linux only, and only supports the XtraDB/InnoDB storage engines (although there is experimental support for MyISAM - see the wsrep_replicate_myisam system variable).

+

+%package          devel

+Summary:          Development headers for mariadb

+Requires:         %{name} = %{version}-%{release}

 %description devel

 Development headers for developing applications linking to maridb

+%package          errmsg

+Summary:          errmsg for mariadb

+

+%description      errmsg

+errmsg for maridb

 %prep

 %setup -q %{name}-%{version}

 %build

-cmake . \

-      -DCMAKE_INSTALL_PREFIX=/usr   \

-      -DCMAKE_BUILD_TYPE=Release    \

-      -DINSTALL_MANDIR=share/man \

-      -DINSTALL_DOCDIR=share/doc \

-      -DINSTALL_DOCREADMEDIR=share/doc/%{name} \

-      -DINSTALL_SUPPORTFILESDIR=share/support-files \

-      -DINSTALL_SYSCONFDIR="%{_sysconfdir}" \

-      -Wno-dev

-

-make %{?_smp_mflags}

+mkdir build && cd build

+

+cmake -DCMAKE_BUILD_TYPE=Release                        \

+      -DCMAKE_INSTALL_PREFIX=/usr                       \

+      -DINSTALL_DOCDIR=share/doc/mariadb-10.2.8         \

+      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.2.8   \

+      -DINSTALL_MANDIR=share/man                        \

+      -DINSTALL_MYSQLSHAREDIR="share/mysql"           \

+      -DINSTALL_SYSCONFDIR="%{_sysconfdir}"             \

+      -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d"   \

+      -DINSTALL_MYSQLTESTDIR=share/mysql/test           \

+      -DINSTALL_PLUGINDIR=lib/mysql/plugin              \

+      -DINSTALL_SBINDIR=sbin                            \

+      -DINSTALL_SCRIPTDIR=bin                           \

+      -DINSTALL_SQLBENCHDIR=share/mysql/bench           \

+      -DINSTALL_SUPPORTFILESDIR=share                   \

+      -DMYSQL_DATADIR="%{_var}/lib/mysql"               \

+      -DMYSQL_UNIX_ADDR="%{_var}/lib/mysql/mysqld.sock" \

+      -DWITH_EXTRA_CHARSETS=complex                     \

+      -DWITH_EMBEDDED_SERVER=ON                         \

+      -DSKIP_TESTS=ON                                   \

+      -DTOKUDB_OK=0                                     \

+      ..

+make

 %install

+cd build

 make DESTDIR=%{buildroot} install

+mkdir -p %{buildroot}/%{_libdir}/systemd/system

+

+mv  %{buildroot}/usr/share/systemd/mariadb.service %{buildroot}/%{_libdir}/systemd/system/mariadb.service

+mv  %{buildroot}/usr/share/systemd/mariadb@.service %{buildroot}/%{_libdir}/systemd/system/mariadb@.service

+rm %{buildroot}/%{_sbindir}/rcmysql

+rm %{buildroot}/%{_libdir}/*.a

+mkdir -p %{buildroot}/%{_var}/lib/mysql

+install -vdm755 %{buildroot}%{_libdir}/systemd/system-preset

+echo "disable mariadb.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-mariadb.preset

 %check

-make check

+cd build

+make test

+

+%post -p /sbin/ldconfig

+%postun -p /sbin/ldconfig

+

+%pre server

+if [ $1 -eq 1 ] ; then

+    getent group  mysql  >/dev/null || groupadd -r mysql

+    getent passwd mysql  >/dev/null || useradd  -c "mysql" -s /bin/false -g mysql -M -r mysql

+fi

+%post server

+/sbin/ldconfig

+chown  mysql:mysql %{_var}/lib/mysql || :

+mysql_install_db --datadir="/var/lib/mysql" --user="mysql" --basedir="/usr" >/dev/null || :

+%systemd_post  mariadb.service

+

+%postun server

+/sbin/ldconfig

+if [ $1 -eq 0 ] ; then

+    if getent passwd mysql >/dev/null; then

+        userdel mysql

+    fi

+    if getent group mysql >/dev/null; then

+        groupdel mysql

+    fi

+fi

+%systemd_postun_with_restart mariadb.service

+

+%preun server

+%systemd_preun mariadb.service

+

+%clean

+rm -rf %{buildroot}

 %files

 %defattr(-,root,root)

-%{_libdir}/plugin/*

-%{_libdir}/libmysqlclient.so.*

-%{_libdir}/libmysqlclient_r.so.*

-%{_bindir}/*

-%{_mandir}/man1/*

-%{_mandir}/man8/*

-/usr/scripts/mysql_install_db

+%{_libdir}/libmysqlclient.so

+%{_libdir}/libmysqlclient_r.so

+%{_libdir}/libmariadb.so.*

+%{_bindir}/msql2mysql

+%{_bindir}/mysql

+%{_bindir}/mysql_find_rows

+%{_bindir}/mysql_plugin

+%{_bindir}/mysql_waitpid

+%{_bindir}/mysqlaccess

+%{_bindir}/mysqladmin

+%{_bindir}/mysqlbinlog

+%{_bindir}/mysqlcheck

+%{_bindir}/mysqldump

+%{_bindir}/mysqlimport

+%{_bindir}/mysqlshow

+%{_bindir}/mysqlslap

+%{_bindir}/mariadb_config

+%{_bindir}/mysql_client_test

+%{_bindir}/mysql_client_test_embedded

+%{_bindir}/mysql_config

+%{_bindir}/mysql_convert_table_format

+%{_bindir}/mysql_embedded

+%{_bindir}/mysql_fix_extensions

+%{_bindir}/mysql_ldb

+%{_bindir}/mysql_setpermission

+%{_bindir}/mysql_upgrade

+%{_bindir}/mysqltest

+%{_bindir}/mysqltest_embedded

+%{_bindir}/mytop

+%{_bindir}/perror

+%{_bindir}/sst_dump

+%{_mandir}/man1/msql2mysql.1.gz

+%{_mandir}/man1/mysql.1.gz

+%{_mandir}/man1/mysqlaccess.1.gz

+%{_mandir}/man1/mysqladmin.1.gz

+%{_mandir}/man1/mysqlbinlog.1.gz

+%{_mandir}/man1/mysqlcheck.1.gz

+%{_mandir}/man1/mysql_client_test.1.gz

+%{_mandir}/man1/mysql_client_test_embedded.1.gz

+%{_mandir}/man1/mysql_config.1.gz

+%{_mandir}/man1/mysql_convert_table_format.1.gz

+%{_mandir}/man1/mysqldump.1.gz

+%{_mandir}/man1/mysqldumpslow.1.gz

+%{_mandir}/man1/mysql_find_rows.1.gz

+%{_mandir}/man1/mysql_fix_extensions.1.gz

+%{_mandir}/man1/mysql_plugin.1.gz

+%{_mandir}/man1/mysql_secure_installation.1.gz

+%{_mandir}/man1/mysql_setpermission.1.gz

+%{_mandir}/man1/mysqlshow.1.gz

+%{_mandir}/man1/mysqlslap.1.gz

+%{_mandir}/man1/mysql-stress-test.pl.1.gz

+%{_mandir}/man1/mysqltest.1.gz

+%{_mandir}/man1/mysqltest_embedded.1.gz

+%{_mandir}/man1/mysql-test-run.pl.1.gz

+%{_mandir}/man1/mysql_tzinfo_to_sql.1.gz

+%{_mandir}/man1/mysql_upgrade.1.gz

+%{_mandir}/man1/mysql_waitpid.1.gz

+%{_mandir}/man1/perror.1.gz

+%{_datadir}/mysql/charsets/*

+%{_datadir}/magic

+%doc COPYING CREDITS

+

+%exclude /usr/share/mysql/bench

+%exclude /usr/share/mysql/test

+%exclude /usr/data/test/db.opt

+%exclude /usr/share/doc/mariadb-10.2.8/*

+%exclude /etc/init.d/mysql

+

+%files server

 %config(noreplace) %{_sysconfdir}/logrotate.d/mysql

 %config(noreplace) %{_sysconfdir}/my.cnf

-%{_datadir}/charsets/*

-%{_datadir}/support-files/*

-%{_datadir}/czech/errmsg.sys

-%{_datadir}/danish/errmsg.sys

-%{_datadir}/dutch/errmsg.sys

-%{_datadir}/english/errmsg.sys

-%{_datadir}/errmsg-utf8.txt

-%{_datadir}/estonian/errmsg.sys

-%{_datadir}/fill_help_tables.sql

-%{_datadir}/french/errmsg.sys

-%{_datadir}/german/errmsg.sys

-%{_datadir}/greek/errmsg.sys

-%{_datadir}/hungarian/errmsg.sys

-%{_datadir}/install_spider.sql

-%{_datadir}/italian/errmsg.sys

-%{_datadir}/japanese/errmsg.sys

-%{_datadir}/korean/errmsg.sys

-%{_datadir}/maria_add_gis_sp.sql

-%{_datadir}/maria_add_gis_sp_bootstrap.sql

-%{_datadir}/mroonga/install.sql

-%{_datadir}/mroonga/uninstall.sql

-%{_datadir}/mysql_performance_tables.sql

-%{_datadir}/mysql_system_tables.sql

-%{_datadir}/mysql_system_tables_data.sql

-%{_datadir}/mysql_test_data_timezone.sql

-%{_datadir}/mysql_to_mariadb.sql

-%{_datadir}/norwegian-ny/errmsg.sys

-%{_datadir}/norwegian/errmsg.sys

-%{_datadir}/pkgconfig/mariadb.pc

-%{_datadir}/polish/errmsg.sys

-%{_datadir}/portuguese/errmsg.sys

-%{_datadir}/romanian/errmsg.sys

-%{_datadir}/russian/errmsg.sys

-%{_datadir}/serbian/errmsg.sys

-%{_datadir}/slovak/errmsg.sys

-%{_datadir}/spanish/errmsg.sys

-%{_datadir}/swedish/errmsg.sys

-%{_datadir}/ukrainian/errmsg.sys

-%doc COPYING CREDITS README

-

-%exclude %{_sysconfdir}/init.d/*

-%exclude /usr/sql-bench

-%exclude /usr/mysql-test

-%exclude /usr/data/test/*

-%exclude /usr/share/doc

+%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf

+%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset

+%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf

+%config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf

+%dir %attr(0750,mysql,mysql) %{_var}/lib/mysql

+%{_libdir}/libmysqld.so.*

+%{_libdir}/mysql/plugin*

+%{_bindir}/aria_chk

+%{_bindir}/aria_dump_log

+%{_bindir}/aria_ftdump

+%{_bindir}/aria_pack

+%{_bindir}/aria_read_log

+%{_bindir}/innochecksum

+%{_bindir}/mariabackup

+%{_bindir}/mariadb-service-convert

+%{_bindir}/mbstream

+%{_bindir}/myisam_ftdump

+%{_bindir}/myisamchk

+%{_bindir}/myisamlog

+%{_bindir}/myisampack

+%{_bindir}/mysql_install_db

+%{_bindir}/mysql_secure_installation

+%{_bindir}/mysql_tzinfo_to_sql

+%{_bindir}/mysqld_safe

+%{_bindir}/mysqld_multi

+%{_bindir}/mysqld_safe_helper

+%{_bindir}/mysqldumpslow

+%{_bindir}/mysqlhotcopy

+%{_bindir}/my_print_defaults

+%{_bindir}/replace

+%{_bindir}/resolve_stack_dump

+%{_bindir}/resolveip

+%{_bindir}/wsrep_sst_common

+%{_bindir}/wsrep_sst_mariabackup

+%{_bindir}/wsrep_sst_mysqldump

+%{_bindir}/wsrep_sst_rsync

+%{_bindir}/wsrep_sst_xtrabackup

+%{_bindir}/wsrep_sst_xtrabackup-v2

+%{_sbindir}/*

+%{_libdir}/systemd/system/mariadb.service

+%{_libdir}/systemd/system/mariadb@.service

+%{_libdir}/systemd/system-preset/50-mariadb.preset

+%{_datadir}/binary-configure

+%{_datadir}/my-huge.cnf

+%{_datadir}/my-innodb-heavy-4G.cnf

+%{_datadir}/my-large.cnf

+%{_datadir}/my-medium.cnf

+%{_datadir}/my-small.cnf

+%{_datadir}/mysql-log-rotate

+%{_datadir}/mysql.server

+%{_datadir}/mysqld_multi.server

+%{_datadir}/policy/apparmor/README

+%{_datadir}/policy/apparmor/usr.sbin.mysqld

+%{_datadir}/policy/apparmor/usr.sbin.mysqld.local

+%{_datadir}/policy/selinux/README

+%{_datadir}/policy/selinux/mariadb-server.fc

+%{_datadir}/policy/selinux/mariadb-server.te

+%{_datadir}/policy/selinux/mariadb.te

+%{_datadir}/wsrep.cnf

+%{_datadir}/wsrep_notify

+%{_mandir}/man1/aria_chk.1.gz

+%{_mandir}/man1/aria_dump_log.1.gz

+%{_mandir}/man1/aria_ftdump.1.gz

+%{_mandir}/man1/aria_pack.1.gz

+%{_mandir}/man1/aria_read_log.1.gz

+%{_mandir}/man1/innochecksum.1.gz

+%{_mandir}/man1/mariadb-service-convert.1.gz

+%{_mandir}/man1/myisamchk.1.gz

+%{_mandir}/man1/myisam_ftdump.1.gz

+%{_mandir}/man1/myisamlog.1.gz

+%{_mandir}/man1/myisampack.1.gz

+%{_mandir}/man1/my_print_defaults.1.gz

+%{_mandir}/man1/my_safe_process.1.gz

+%{_mandir}/man1/mysqld_multi.1.gz

+%{_mandir}/man1/mysqld_safe.1.gz

+%{_mandir}/man1/mysqld_safe_helper.1.gz

+%{_mandir}/man1/mysqlhotcopy.1.gz

+%{_mandir}/man1/mysqlimport.1.gz

+%{_mandir}/man1/mysql_install_db.1.gz

+%{_mandir}/man1/mysql.server.1.gz

+%{_mandir}/man1/replace.1.gz

+%{_mandir}/man1/resolveip.1.gz

+%{_mandir}/man1/resolve_stack_dump.1.gz

+%{_mandir}/man1/tokuftdump.1.gz

+%{_mandir}/man1/tokuft_logdump.1.gz

+%{_mandir}/man1/wsrep_sst_common.1.gz

+%{_mandir}/man1/wsrep_sst_mysqldump.1.gz

+%{_mandir}/man1/wsrep_sst_rsync.1.gz

+%{_mandir}/man1/wsrep_sst_xtrabackup.1.gz

+%{_mandir}/man1/wsrep_sst_xtrabackup-v2.1.gz

+%{_mandir}/man8/*

+%{_datadir}/mysql/fill_help_tables.sql

+%{_datadir}/mysql/install_spider.sql

+%{_datadir}/mysql/maria_add_gis_sp.sql

+%{_datadir}/mysql/maria_add_gis_sp_bootstrap.sql

+%{_datadir}/mysql/mroonga/install.sql

+%{_datadir}/mysql/mroonga/uninstall.sql

+%{_datadir}/mysql/mysql_performance_tables.sql

+%{_datadir}/mysql/mysql_system_tables.sql

+%{_datadir}/mysql/mysql_system_tables_data.sql

+%{_datadir}/mysql/mysql_test_data_timezone.sql

+%{_datadir}/mysql/mysql_to_mariadb.sql

+

+

+%files server-galera

+%{_bindir}/galera_new_cluster

+%{_bindir}/galera_recovery

+%{_datadir}/systemd/use_galera_new_cluster.conf

+%{_mandir}/man1/galera_new_cluster.1.gz

+%{_mandir}/man1/galera_recovery.1.gz

 %files devel

-%{_libdir}/libmysqlclient.so

-%{_libdir}/libmysqlclient_r.so

-%{_libdir}/*.a

 %{_includedir}/mysql/*

 %{_datadir}/aclocal/mysql.m4

+%{_libdir}/libmariadb.so

+%{_libdir}/libmysqld.so

+%{_datadir}/pkgconfig/mariadb.pc

+

+%files errmsg

+%{_datadir}/mysql/czech/errmsg.sys

+%{_datadir}/mysql/danish/errmsg.sys

+%{_datadir}/mysql/dutch/errmsg.sys

+%{_datadir}/mysql/english/errmsg.sys

+%{_datadir}/mysql/errmsg-utf8.txt

+%{_datadir}/mysql/estonian/errmsg.sys

+%{_datadir}/mysql/french/errmsg.sys

+%{_datadir}/mysql/german/errmsg.sys

+%{_datadir}/mysql/greek/errmsg.sys

+%{_datadir}/mysql/hungarian/errmsg.sys

+%{_datadir}/mysql/italian/errmsg.sys

+%{_datadir}/mysql/japanese/errmsg.sys

+%{_datadir}/mysql/korean/errmsg.sys

+%{_datadir}/mysql/norwegian-ny/errmsg.sys

+%{_datadir}/mysql/norwegian/errmsg.sys

+%{_datadir}/mysql/polish/errmsg.sys

+%{_datadir}/mysql/portuguese/errmsg.sys

+%{_datadir}/mysql/romanian/errmsg.sys

+%{_datadir}/mysql/russian/errmsg.sys

+%{_datadir}/mysql/serbian/errmsg.sys

+%{_datadir}/mysql/slovak/errmsg.sys

+%{_datadir}/mysql/spanish/errmsg.sys

+%{_datadir}/mysql/swedish/errmsg.sys

+%{_datadir}/mysql/ukrainian/errmsg.sys

+%{_datadir}/mysql/hindi/errmsg.sys

 %changelog

+*   Wed Sep 06 2017 Xiaolin Li <xiaolinl@vmware.com> 10.2.8-1

+-   Update to 10.2.8 and enable build server. Specify MariaDB conflicts with MySQL.

 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 10.1.24-1

 -   Initial packaging for Photon