From 645394eeebf0a21be42df535ec9a6428572e0f1a5e404cf67c80b8aaa1cda087 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 30 May 2010 23:00:28 +0000 Subject: [PATCH] Accepting request 40681 from server:database Copy from server:database/mariadb based on submit request 40681 from user -miska- OBS-URL: https://build.opensuse.org/request/show/40681 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=2 --- mariadb-5.1.44.tar.bz2 | 3 --- mariadb-5.1.44b.tar.bz2 | 3 +++ mariadb.changes | 10 ++++++++++ mariadb.spec | 18 +++--------------- 4 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 mariadb-5.1.44.tar.bz2 create mode 100644 mariadb-5.1.44b.tar.bz2 diff --git a/mariadb-5.1.44.tar.bz2 b/mariadb-5.1.44.tar.bz2 deleted file mode 100644 index 37e296e..0000000 --- a/mariadb-5.1.44.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c8d4f5545d2dc740d1a84a6e11a61122ff25d20be37f35ea8816bba883f82f9 -size 16757135 diff --git a/mariadb-5.1.44b.tar.bz2 b/mariadb-5.1.44b.tar.bz2 new file mode 100644 index 0000000..8de26f6 --- /dev/null +++ b/mariadb-5.1.44b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2af7c99965a90f8f32b11516391ee46a80d0cb30221797e9190ff563f95c0cfa +size 16752425 diff --git a/mariadb.changes b/mariadb.changes index d869dbb..c5f8168 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 25 14:44:15 CEST 2010 - mhrusecky@suse.cz + +- updated to MariaDB 5.1.44b + - important security related update + - changelog: + http://askmonty.org/wiki/Manual:MariaDB_5.1.44b_Release_Notes +- not obsoleting mysql, to make sure mysql gets replaced by + mysql-community-server by default + ------------------------------------------------------------------- Mon Apr 26 10:34:41 CEST 2010 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index fe7ef0f..a60f563 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -32,12 +32,12 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server Version: 5.1.44 -Release: 1 +Release: 2 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com # http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick -Source: mariadb-%{version}.tar.bz2 +Source: mariadb-%{version}b.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run @@ -112,9 +112,7 @@ Requires: logrotate %endif # required by rcmysql Requires: %{name}-client perl-base -Obsoletes: mysql-Max < %{srv_vers} Provides: mysql-Max = %{srv_vers} -Obsoletes: mysql < %{srv_vers} Provides: mysql = %{srv_vers} Conflicts: otherproviders(mysql) @@ -167,7 +165,6 @@ Authors: #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release -Obsoletes: mysql-devel < %srv_vers Requires: libmysqlclient16 = %srv_vers libmysqlclient_r16 = %srv_vers glibc-devel zlib-devel openssl-devel Summary: MariaDB Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -252,7 +249,6 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB Client Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} -Obsoletes: mysql-client < %{srv_vers} Conflicts: otherproviders(mysql-client) %description client @@ -272,7 +268,6 @@ License: LGPLv2.1 Summary: MariaDB - Benchmarks Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} -Obsoletes: mysql-bench < %{srv_vers} Conflicts: otherproviders(mysql-bench) %description bench @@ -294,7 +289,6 @@ Summary: MariaDB server with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{srv_vers} Provides: mysql-debug = %{srv_vers} -Obsoletes: mysql-debug < %{srv_vers} Conflicts: otherproviders(mysql-debug) %description debug @@ -322,7 +316,6 @@ Requires: perl-DBD-mysql Requires: %{name}-tools = %{srv_vers} Requires: %{name}-bench = %{srv_vers} Provides: mysql-test = %{srv_vers} -Obsoletes: mysql-test < %{srv_vers} Conflicts: otherproviders(mysql-test) %description test @@ -346,7 +339,6 @@ 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} -Obsoletes: mysql-tools < %{srv_vers} Conflicts: otherproviders(mysql-tools) %description tools @@ -367,7 +359,6 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} -Obsoletes: mysql-ndb-storage < %{srv_vers} Conflicts: otherproviders(mysql-ndb-storage) %description ndb-storage @@ -383,7 +374,6 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} -Obsoletes: mysql-ndb-management < %{srv_vers} Conflicts: otherproviders(mysql-ndb-management) %description ndb-management @@ -399,7 +389,6 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} -Obsoletes: mysql-ndb-tools < %{srv_vers} Conflicts: otherproviders(mysql-ndb-tools) %description ndb-tools @@ -413,7 +402,6 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers} -Obsoletes: mysql-ndb-extra < %{srv_vers} Conflicts: otherproviders(mysql-ndb-extra) %description ndb-extra @@ -425,7 +413,7 @@ advanced user. They should be used with caution. %prep #------------------------------------------------------------------------------- -%setup -q -n mariadb-%version +%setup -q -n mariadb-%{version}b cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . %patch2