Accepting request 40681 from server:database

checked in (request 40681)

OBS-URL: https://build.opensuse.org/request/show/40681
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=22

mariadb-5.1.44.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c8d4f5545d2dc740d1a84a6e11a61122ff25d20be37f35ea8816bba883f82f9
+size 16757135

mariadb-5.1.44b.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2af7c99965a90f8f32b11516391ee46a80d0cb30221797e9190ff563f95c0cfa
-size 16752425

mariadb.changes

@@ -3,16 +3,6 @@ Wed May 26 14:02:25 CEST 2010 - mhrusecky@suse.cz
 
 - Fixed build for Fedora12
 
--------------------------------------------------------------------
-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
 

mariadb.spec

@@ -32,12 +32,12 @@
 Name:           mariadb
 Summary:        A True Multiuser, Multithreaded SQL Database Server
 Version:        5.1.44
-Release:        2
+Release:        1
 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}b.tar.bz2
+Source:         mariadb-%{version}.tar.bz2
 Source2:        baselibs.conf
 Source3:        README.debug
 Source4:        suse-test-run
@@ -115,7 +115,9 @@ 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)
 
@@ -168,6 +170,7 @@ 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,6 +255,7 @@ 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
@@ -271,6 +275,7 @@ 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
@@ -292,6 +297,7 @@ 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
@@ -319,6 +325,7 @@ 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
@@ -342,6 +349,7 @@ 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
@@ -362,6 +370,7 @@ 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
@@ -377,6 +386,7 @@ 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
@@ -392,6 +402,7 @@ 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
@@ -405,6 +416,7 @@ 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
@@ -416,7 +428,7 @@ advanced user.  They should be used with caution.
 
 %prep
 #-------------------------------------------------------------------------------
-%setup -q -n mariadb-%{version}b
+%setup -q -n mariadb-%version
 cp %_sourcedir/README.SuSE .
 cp %_sourcedir/suse-test-run .
 %patch2