diff --git a/build.inc b/build.inc index 1918c73..c2d5283 100644 --- a/build.inc +++ b/build.inc @@ -20,7 +20,7 @@ BuildMySQL() { pushd _build$suffix ../configure \ --enable-assembler \ - --without-readline \ + --with-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index d13a8e2..36be3cc 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5574998e9d4324ff05c8bd698e0bd3cd92b1f449b855759dc6d6db5a486bf053 +oid sha256:724214b830efcfb4bb1226483d087ddc4bfffedd78086a09f98c065487e49754 size 217 diff --git a/install.inc b/install.inc index 78a2659..d01c705 100644 --- a/install.inc +++ b/install.inc @@ -55,7 +55,7 @@ filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysq filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table,select_all} >mysql-ndb-extra.files +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -127,6 +127,10 @@ sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mys ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%if 0%{?cluster} > 1 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6 +%endif if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf fi diff --git a/mariadb-5.2.10.tar.bz2 b/mariadb-5.2.10.tar.bz2 deleted file mode 100644 index 4b5cd55..0000000 --- a/mariadb-5.2.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4f129108f512b1853e17d0fd83a84c2e025c5f5c9ee53dd72e651491f200c38 -size 19112928 diff --git a/mariadb-5.3.5-ga.tar.bz2 b/mariadb-5.3.5-ga.tar.bz2 new file mode 100644 index 0000000..a27d5c1 --- /dev/null +++ b/mariadb-5.3.5-ga.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd82bf9bd5d2f52305293c57e0f610b57c522517cff0075a2d81cca929808c09 +size 20123831 diff --git a/mariadb.changes b/mariadb.changes index 8120fef..859b49e 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 12 16:03:38 UTC 2012 - mhrusecky@suse.cz + +- migrated to MariaDB 5.3.5, see: + http://kb.askmonty.org/en/what-is-mariadb-53 + http://kb.askmonty.org/en/release-notes-mariadb-53-series + http://kb.askmonty.org/en/changelogs-mariadb-53-series + +------------------------------------------------------------------- +Sat Feb 18 08:25:25 UTC 2012 - mhrusecky@suse.cz + +- updated license to conform new policy + ------------------------------------------------------------------- Mon Jan 30 08:46:31 UTC 2012 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index 07ac9f0..958f8cd 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -22,6 +22,8 @@ %define use_cmake 0 %define cluster 0 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb +%define use_extra_provides 1 +%define extra_provides mariadb_53 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -32,13 +34,13 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.2.10 +Version: 5.3.5 Release: 1 %define srv_vers 5.1.60 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org -Source: mariadb-%{version}.tar.bz2 +Source: mariadb-%{version}-ga.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run @@ -57,6 +59,7 @@ PreReq: %install_info_prereq %insserv_prereq %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel BuildRequires: autoconf automake cmake libtool zlib-devel +BuildRequires: pam-devel %if 0%{?suse_version} BuildRequires: pwdutils tcpd-devel %endif @@ -75,6 +78,10 @@ Requires: logrotate Requires: %{name}-client perl-base Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides} = %{version} +Obsoletes: %{extra_provides} < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql < %{srv_vers} Obsoletes: mysql-Max < %{srv_vers} @@ -100,7 +107,7 @@ Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -108,7 +115,7 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. %package -n libmysqld16 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ @@ -117,7 +124,7 @@ This package contains the development header files and libraries for developing applications that embed the MariaDB. %package -n libmysqld-devel -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files # the headers files are the shared Requires: libmysqlclient-devel = %version @@ -132,7 +139,7 @@ for developing applications that embed the MariaDB. %package -n libmariadbclient16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient16 @@ -141,7 +148,7 @@ languages and applications need to dynamically load and use MariaDB. %package -n libmariadbclient_r16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient_r16 @@ -149,10 +156,14 @@ This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. %package client -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Client for MariaDB Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-client = %{version} +Obsoletes: %{extra_provides}-client < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-client < %{srv_vers} %endif @@ -163,10 +174,14 @@ This package contains the standard clients for MariaDB. %package bench Requires: %{name}-client perl-DBD-mysql -License: LGPLv2.1 +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-bench = %{version} +Obsoletes: %{extra_provides}-bench < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-bench < %{srv_vers} %endif @@ -180,12 +195,16 @@ the directory /usr/share/sql-bench after starting MariaDB. %package debug-version -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-debug-verion = %{version} +Obsoletes: %{extra_provides}-debug-version < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-debug < %{srv_vers} %endif @@ -199,7 +218,7 @@ standard server. Read /usr/share/doc/packages/mysql/README.debug for information on how to use the debug server. %package test -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} @@ -208,6 +227,10 @@ Requires: perl-DBD-mysql Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-test = %{version} +Obsoletes: %{extra_provides}-test < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-test < %{srv_vers} %endif @@ -219,13 +242,17 @@ This package contains the test scripts and data for MariaDB. To run the testsuite, run /usr/share/mysql-test/suse-test-run. %package tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB tools Group: Productivity/Databases/Servers Requires: perl-DBD-mysql # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror Provides: mysql-tools = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-tools = %{version} +Obsoletes: %{extra_provides}-tools < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-tools < %{srv_vers} %endif @@ -237,8 +264,22 @@ applications with MariaDB. %if 0%{?cluster} > 0 +%if 0%{?cluster} > 1 + +%package -n libndbclient6 +Summary: Shared Libraries for cluster client +License: SUSE-GPL-2.0-with-FLOSS-exception +Group: Development/Libraries/Other + +%description -n libndbclient6 +This package contains the shared libraries (.so) which certain +languages and applications need to dynamically load and use MariaDB +cluster. + +%endif + %package ndb-storage -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} @@ -252,7 +293,7 @@ computers that should store ndbcluster table data. %package ndb-management -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} @@ -265,7 +306,7 @@ It is necessary to have this package installed on at least one computer in the cluster. %package ndb-tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} @@ -276,7 +317,7 @@ Conflicts: otherproviders(mysql-ndb-tools) This package contains ndbcluster storage engine basic tools. %package ndb-extra -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} @@ -289,7 +330,7 @@ advanced user. They should be used with caution. %endif %prep -%setup -q -n mariadb-%{version} -D -a 9 +%setup -q -n mariadb-%{version}-ga -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . # apply patches from series @@ -377,6 +418,13 @@ fi %postun -n libmariadbclient_r16 -p /sbin/ldconfig +%if 0%{cluster} > 1 + +%post -n libndbclient6 -p /sbin/ldconfig + +%postun -n libndbclient6 -p /sbin/ldconfig +%endif + %if 0%{prefered} > 0 %post -n libmysqld18 -p /sbin/ldconfig @@ -440,6 +488,13 @@ fi %defattr(-, root, root) %{_libdir}/libmariadbclient.so.* +%if 0%{cluster} > 1 + +%files -n libndbclient6 +%defattr(-, root, root) +%{_libdir}/libndbclient.so.* +%endif + %files -n libmariadbclient_r16 %defattr(-, root, root) %{_libdir}/libmariadbclient_r.so.* diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 9edb975..0796800 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9c129c091ef319d1d3519dbac9e65011d8ad06b2eadda0776b793e276cd4348 -size 16277 +oid sha256:58d09931800018a2ae2376463d0fee5374cbb284dedcd4e81b2931dd42828b28 +size 16629 diff --git a/series b/series index 1764e1f..c1cc216 100644 --- a/series +++ b/series @@ -1,5 +1,5 @@ mysql-community-server-5.1.31-shebang.patch -mysql-community-server-5.1.33-scripts-paths.patch +mariadb-5.3.2-scripts-paths.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch @@ -9,12 +9,13 @@ mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mariadb-5.2.10-myslq-test.patch +mariadb-5.3.3-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.10-plugins-avoid-version.patch +mariadb-5.3.2-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 mysql-community-server-5.1.53-ssl-compilation-fix.patch -mariadb-5.2.10-compilation-fix.patch +mariadb-5.3.3-compilation-fix.patch +mariadb-5.3.3-readline-includes.patch