1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upmerge of the Bug17211588 build

Browse Source
This commit is contained in:
Balasubramanian Kandasamy 2013-08-20 12:06:04 +02:00
commit 9f4b580d9f
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
support-files/mysql.spec.sh
View File

@ -30,7 +30,8 @@
%global mysqld_group mysql
%global mysqldatadir /var/lib/mysql
%define release 1
%global release 2
#
# Macros we use which are not available in all supported versions of RPM
@ -226,7 +227,7 @@
# Configuration based upon above user input, not to be set directly
##############################################################################
%if %{commercial}
%if 0%{?commercial}
%define license_files_server %{src_dir}/LICENSE.mysql
%define license_type Commercial
%else
@ -249,7 +250,6 @@ Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_
URL: http://www.mysql.com/
Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
Vendor: %{mysql_vendor}
Provides: msqlormysql MySQL-server
BuildRequires: %{distro_buildreq}
# Regression tests may take a long time, override the default to skip them
@ -291,9 +291,12 @@ Obsoletes: MySQL-server
%else
Obsoletes: MySQL-server-advanced
%endif
Obsoletes: mysql-server mysql-advanced mysql-server-advanced
Obsoletes: mysql-server < %{version}-%{release}
Obsoletes: mysql-server-advanced
Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise
Obsoletes: MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
Provides: mysql-server = %{version}-%{release}
Provides: mysql-server%{?_isa} = %{version}-%{release}
%description -n MySQL-server%{product_suffix}
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@ -333,7 +336,7 @@ Obsoletes: mysql-advanced < %{version}-%{release}
Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise
Obsoletes: MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
Provides: mysql = %{version}-%{release}
Provides: mysql%{?_isa} = %{version}-%{release}
%description -n MySQL-client%{product_suffix}
This package contains the standard MySQL clients and administration tools.
@ -351,10 +354,13 @@ Obsoletes: MySQL-test
Requires: MySQL-client perl
Obsoletes: MySQL-test-advanced
%endif
Obsoletes: mysql-test mysql-test-advanced
Obsoletes: mysql-test < %{version}-%{release}
Obsoletes: mysql-test-advanced
Obsoletes: mysql-bench MySQL-bench
Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise
Obsoletes: MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
Provides: mysql-test = %{version}-%{release}
Provides: mysql-test%{?_isa} = %{version}-%{release}
AutoReqProv: no
%description -n MySQL-test%{product_suffix}
@ -371,10 +377,12 @@ Obsoletes: MySQL-devel
%else
Obsoletes: MySQL-devel-advanced
%endif
Obsoletes: mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
Obsoletes: mysql-devel < %{version}-%{release}
Obsoletes: mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
Obsoletes: MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
Provides: mysql-devel = %{version}-%{release}
Provides: mysql-devel%{?_isa} = %{version}-%{release}
%description -n MySQL-devel%{product_suffix}
This package contains the development header files and libraries necessary
@ -412,10 +420,13 @@ Obsoletes: MySQL-embedded
Requires: MySQL-devel
Obsoletes: MySQL-embedded-advanced
%endif
Obsoletes: mysql-embedded mysql-embedded-advanced
Obsoletes: mysql-embedded < %{version}-%{release}
Obsoletes: mysql-embedded-advanced
Obsoletes: MySQL-embedded-pro
Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
Provides: mysql-embedded = %{version}-%{release}
Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
%description -n MySQL-embedded%{product_suffix}
This package contains the MySQL server as an embedded library.
@ -1204,6 +1215,9 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Added fix for Bug17211588
* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Cleaned up spec file to resolve rpm dependencies.