mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
Merge with current mysql-5.5
This commit is contained in:
commit
e9a49982e9
1 changed files with 54 additions and 27 deletions
|
@ -283,8 +283,10 @@ documentation and the manual for more information.
|
|||
Summary: MySQL: a very fast and reliable SQL database server
|
||||
Group: Applications/Databases
|
||||
Requires: %{distro_requires}
|
||||
Provides: msqlormysql mysql-server mysql MySQL MySQL-server
|
||||
Obsoletes: MySQL mysql mysql-server MySQL-server MySQL-server-community
|
||||
Provides: msqlormysql mysql MySQL mysql-server MySQL-server
|
||||
Obsoletes: mysql MySQL mysql-server MySQL-server
|
||||
Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise
|
||||
Obsoletes: MySQL-server-advanced MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
|
||||
|
||||
%description -n MySQL-server%{product_suffix}
|
||||
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
|
||||
|
@ -314,8 +316,10 @@ package "MySQL-client%{product_suffix}" as well!
|
|||
%package -n MySQL-client%{product_suffix}
|
||||
Summary: MySQL - Client
|
||||
Group: Applications/Databases
|
||||
Obsoletes: mysql-client MySQL-client MySQL-client-community
|
||||
Provides: mysql-client MySQL-client
|
||||
Obsoletes: mysql-client MySQL-client
|
||||
Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise
|
||||
Obsoletes: MySQL-client-advanced MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
|
||||
|
||||
%description -n MySQL-client%{product_suffix}
|
||||
This package contains the standard MySQL clients and administration tools.
|
||||
|
@ -324,11 +328,14 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
|
|||
|
||||
# ----------------------------------------------------------------------------
|
||||
%package -n MySQL-test%{product_suffix}
|
||||
Requires: MySQL-client%{product_suffix} perl
|
||||
Summary: MySQL - Test suite
|
||||
Group: Applications/Databases
|
||||
Provides: mysql-test
|
||||
Obsoletes: mysql-bench mysql-test MySQL-test-community
|
||||
Requires: MySQL-client perl
|
||||
Provides: mysql-test MySQL-test
|
||||
Obsoletes: mysql-test MySQL-test
|
||||
Obsoletes: mysql-bench MySQL-bench
|
||||
Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise
|
||||
Obsoletes: MySQL-test-advanced MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
|
||||
AutoReqProv: no
|
||||
|
||||
%description -n MySQL-test%{product_suffix}
|
||||
|
@ -340,8 +347,10 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
|
|||
%package -n MySQL-devel%{product_suffix}
|
||||
Summary: MySQL - Development header files and libraries
|
||||
Group: Applications/Databases
|
||||
Provides: mysql-devel
|
||||
Obsoletes: mysql-devel MySQL-devel-community
|
||||
Provides: mysql-devel MySQL-devel
|
||||
Obsoletes: mysql-devel MySQL-devel
|
||||
Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
|
||||
Obsoletes: MySQL-devel-advanced MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
|
||||
|
||||
%description -n MySQL-devel%{product_suffix}
|
||||
This package contains the development header files and libraries necessary
|
||||
|
@ -353,8 +362,12 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
|
|||
%package -n MySQL-shared%{product_suffix}
|
||||
Summary: MySQL - Shared libraries
|
||||
Group: Applications/Databases
|
||||
Provides: mysql-shared
|
||||
Obsoletes: MySQL-shared-community
|
||||
Provides: mysql-shared MySQL-shared
|
||||
Obsoletes: mysql-shared MySQL-shared-standard MySQL-shared-pro
|
||||
Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl
|
||||
Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared
|
||||
Obsoletes: MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise
|
||||
Obsoletes: MySQL-shared-advanced MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl
|
||||
|
||||
%description -n MySQL-shared%{product_suffix}
|
||||
This package contains the shared libraries (*.so*) which certain languages
|
||||
|
@ -362,10 +375,14 @@ and applications need to dynamically load and use MySQL.
|
|||
|
||||
# ----------------------------------------------------------------------------
|
||||
%package -n MySQL-embedded%{product_suffix}
|
||||
Summary: MySQL - embedded library
|
||||
Summary: MySQL - Embedded library
|
||||
Group: Applications/Databases
|
||||
Requires: MySQL-devel%{product_suffix}
|
||||
Obsoletes: mysql-embedded MySQL-embedded-community
|
||||
Requires: MySQL-devel
|
||||
Provides: mysql-embedded MySQL-embedded
|
||||
Obsoletes: mysql-embedded MySQL-embedded
|
||||
Obsoletes: MySQL-embedded-pro
|
||||
Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
|
||||
Obsoletes: MySQL-embedded-advanced MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
|
||||
|
||||
%description -n MySQL-embedded%{product_suffix}
|
||||
This package contains the MySQL server as an embedded library.
|
||||
|
@ -1131,6 +1148,16 @@ echo "=====" >> $STATUS_HISTORY
|
|||
# merging BK trees)
|
||||
##############################################################################
|
||||
%changelog
|
||||
* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
|
||||
|
||||
- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
|
||||
the RPMs of any configuration (of the current or the preceding release series)
|
||||
by the new ones. This is done by not using the implicitly generated capabilities
|
||||
(which include the configuration name) and relying on more generic ones which
|
||||
just list the function ("server", "client", ...).
|
||||
The implicit generation cannot be prevented, so all these capabilities must be
|
||||
explicitly listed in "Obsoletes:"
|
||||
|
||||
* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
|
||||
|
||||
- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to
|
||||
|
|
Loading…
Add table
Reference in a new issue