forked from pool/mariadb
187 lines
7.0 KiB
Diff
187 lines
7.0 KiB
Diff
--- install.inc.orig
|
|
+++ install.inc
|
|
@@ -119,4 +119,5 @@ sed -i 's|doc/packages/mysql|doc/package
|
|
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
|
|
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
|
|
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
|
|
-
|
|
+mkdir -p '%buildroot'/etc/mysql
|
|
+[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql
|
|
--- mariadb.changes.orig
|
|
+++ mariadb.changes
|
|
@@ -1,13 +1,20 @@
|
|
-------------------------------------------------------------------
|
|
-Tue Dec 7 12:03:18 CET 2010 - mhrusecky@suse.cz
|
|
+Tue Dec 7 11:27:24 CET 2010 - mhrusecky@suse.cz
|
|
|
|
-- updated to MariaDB 5.1.53
|
|
- - based on MySQL 5.1.53 maintenance update
|
|
- - changelog:
|
|
- http://kb.askmonty.org/v/mariadb-5153-changelog
|
|
- - release notes:
|
|
- http://kb.askmonty.org/v/mariadb-5153-release-notes
|
|
-
|
|
+- updated to MariaDB 5.2.4
|
|
+ * Release notes:
|
|
+ http://kb.askmonty.org/v/mariadb-524-release-notes
|
|
+ * Changelog:
|
|
+ http://kb.askmonty.org/v/mariadb-524-changelog
|
|
+
|
|
+-------------------------------------------------------------------
|
|
+Wed Nov 10 11:58:13 CET 2010 - mhrusecky@suse.cz
|
|
+
|
|
+- updated to MariaDB 5.2.3
|
|
+ * Release notes:
|
|
+ http://kb.askmonty.org/v/mariadb-523-release-notes
|
|
+ * Changelog:
|
|
+ http://kb.askmonty.org/v/mariadb-523-changelog
|
|
|
|
-------------------------------------------------------------------
|
|
Thu Oct 21 11:07:15 CEST 2010 - mhrusecky@suse.cz
|
|
--- mariadb.spec.orig
|
|
+++ mariadb.spec
|
|
@@ -1,5 +1,5 @@
|
|
#
|
|
-# spec file for package mariadb (Version 5.1.44)
|
|
+# spec file for package mariadb (Version 5.2.3)
|
|
#
|
|
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
#
|
|
@@ -20,7 +20,7 @@
|
|
# Few definitions which will alter build
|
|
%define prefered 0
|
|
%define cluster 0
|
|
-%define builtin_plugins partition,csv,heap,maria,pbxt,myisam,myisammrg,xtradb
|
|
+%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
|
|
|
|
%if %{?rel:0}%{!?rel:1}
|
|
%define rel 1
|
|
@@ -29,9 +29,9 @@
|
|
#Packager: %packager
|
|
#Vendor: %vendor
|
|
|
|
-Name: mariadb
|
|
+Name: mariadb52
|
|
Summary: A True Multiuser, Multithreaded SQL Database Server
|
|
-Version: 5.1.53
|
|
+Version: 5.2.4
|
|
%define srv_vers 5.1.53
|
|
Release: 0
|
|
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
|
|
@@ -90,13 +90,13 @@ This package only contains the server-si
|
|
%if ! 0%{?prefered} > 0
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%package -n libmariadbclient16
|
|
+%package -n libmariadb52client16
|
|
#-------------------------------------------------------------------------------
|
|
Summary: MariaDB Shared Libraries
|
|
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
|
|
Group: Development/Libraries/Other
|
|
|
|
-%description -n libmariadbclient16
|
|
+%description -n libmariadb52client16
|
|
This package contains the shared libraries (.so) which certain
|
|
languages and applications need to dynamically load and use MariaDB.
|
|
|
|
@@ -106,13 +106,13 @@ Authors:
|
|
David Axmark <davida@mysql.com>
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%package -n libmariadbclient_r16
|
|
+%package -n libmariadb52client_r16
|
|
#-------------------------------------------------------------------------------
|
|
Summary: MariaDB Shared Libraries
|
|
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
|
|
Group: Development/Libraries/Other
|
|
|
|
-%description -n libmariadbclient_r16
|
|
+%description -n libmariadb52client_r16
|
|
This package contains the shared libraries (.so) which certain
|
|
languages and applications need to dynamically load and use MariaDB.
|
|
|
|
@@ -408,7 +408,7 @@ rm -f sql/sql_builtin.cc
|
|
sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
|
|
%if ! 0%{?prefered} > 0
|
|
for i in `grep -Rl mysqlclient .`; do
|
|
- sed -i 's|mysqlclient|mariadbclient|g' $i
|
|
+ sed -i 's|mysqlclient|mariadb52client|g' $i
|
|
done
|
|
%endif
|
|
|
|
@@ -471,25 +471,25 @@ fi
|
|
%if ! 0%{prefered} > 0
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%post -n libmariadbclient16
|
|
+%post -n libmariadb52client16
|
|
#-------------------------------------------------------------------------------
|
|
/sbin/ldconfig
|
|
#-------------------------------------------------------------------------------
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%postun -n libmariadbclient16
|
|
+%postun -n libmariadb52client16
|
|
#-------------------------------------------------------------------------------
|
|
/sbin/ldconfig
|
|
#-------------------------------------------------------------------------------
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%post -n libmariadbclient_r16
|
|
+%post -n libmariadb52client_r16
|
|
#-------------------------------------------------------------------------------
|
|
/sbin/ldconfig
|
|
#-------------------------------------------------------------------------------
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%postun -n libmariadbclient_r16
|
|
+%postun -n libmariadb52client_r16
|
|
#-------------------------------------------------------------------------------
|
|
/sbin/ldconfig
|
|
#-------------------------------------------------------------------------------
|
|
@@ -554,6 +554,8 @@ fi
|
|
#-------------------------------------------------------------------------------
|
|
%defattr(-, root, root)
|
|
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf
|
|
+%dir %attr(0750, root, mysql) /etc/mysql
|
|
+%config(noreplace) %attr(0640, root, mysql) /etc/mysql/*
|
|
%config /etc/logrotate.d/mysql
|
|
%doc %{_defaultdocdir}/%{name}
|
|
%doc %{_infodir}/mysql.info.*
|
|
@@ -576,17 +578,17 @@ fi
|
|
|
|
%if ! 0%{prefered} > 0
|
|
#-------------------------------------------------------------------------------
|
|
-%files -n libmariadbclient16
|
|
+%files -n libmariadb52client16
|
|
#-------------------------------------------------------------------------------
|
|
%defattr(-, root, root)
|
|
-%{_libdir}/libmariadbclient.so.*
|
|
+%{_libdir}/libmariadb52client.so.*
|
|
#-------------------------------------------------------------------------------
|
|
|
|
#-------------------------------------------------------------------------------
|
|
-%files -n libmariadbclient_r16
|
|
+%files -n libmariadb52client_r16
|
|
#-------------------------------------------------------------------------------
|
|
%defattr(-, root, root)
|
|
-%{_libdir}/libmariadbclient_r.so.*
|
|
+%{_libdir}/libmariadb52client_r.so.*
|
|
#-------------------------------------------------------------------------------
|
|
|
|
%endif
|
|
--- series.orig
|
|
+++ series
|
|
@@ -12,9 +12,9 @@ mariadb-5.1.50-install_db-quiet.patch
|
|
mysql-community-server-5.1.51-myslq-test.patch
|
|
mysql-community-server-5.1.51-mysql_config.patch
|
|
mysql-community-server-5.1.51-mysqld_multi-features.patch
|
|
+mariadb-5.2.4-plugins-avoid-version.patch
|
|
mariadb-5.1.50-upgrade-exit-status.patch
|
|
mariadb-5.2.3-cnf.patch
|
|
mariadb-5.2.4-libmysql-no-pkglibdir.patch
|
|
-mariadb-5.1.53-plugins-avoid-version.patch
|
|
mysql-community-server-5.1.53-ssl-compilation-fix.patch
|
|
-mariadb-5.1.53-compilation-fix.patch
|
|
+mariadb-5.2.4-compilation-fix.patch
|