database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED DOES NOT WORK

Browse Source 
Upmerge from 5.1 to 5.5
This commit is contained in:
Joerg Bruehe
2011-10-04 16:21:32 +02:00
parent 97916e9b7b 961f0fd0fc
commit 332fa530e3
1 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,11 +280,13 @@ documentation and the manual for more information.
############################################################################## ##############################################################################
%package -n MySQL-server%{product_suffix} %package -n MySQL-server%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Requires: %{distro_requires} Requires: %{distro_requires}
Provides: msqlormysql mysql-server mysql MySQL MySQL-server Provides: msqlormysql mysql MySQL mysql-server MySQL-server
Obsoletes: MySQL mysql mysql-server MySQL-server MySQL-server-community 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} %description -n MySQL-server%{product_suffix}
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@ -312,10 +314,12 @@ package "MySQL-client%{product_suffix}" as well!
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
%package -n MySQL-client%{product_suffix} %package -n MySQL-client%{product_suffix}
Summary: MySQL - Client Summary: MySQL - Client
Group: Applications/Databases Group: Applications/Databases
Obsoletes: mysql-client MySQL-client MySQL-client-community Provides: mysql-client MySQL-client
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} %description -n MySQL-client%{product_suffix}
This package contains the standard MySQL clients and administration tools. This package contains the standard MySQL clients and administration tools.
@ -324,12 +328,15 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
%package -n MySQL-test%{product_suffix} %package -n MySQL-test%{product_suffix}
Requires: MySQL-client%{product_suffix} perl Summary: MySQL - Test suite
Summary: MySQL - Test suite Group: Applications/Databases
Group: Applications/Databases Requires: MySQL-client perl
Provides: mysql-test Provides: mysql-test MySQL-test
Obsoletes: mysql-bench mysql-test MySQL-test-community Obsoletes: mysql-test MySQL-test
AutoReqProv: no 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} %description -n MySQL-test%{product_suffix}
This package contains the MySQL regression test suite. This package contains the MySQL regression test suite.
@ -338,10 +345,12 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
%package -n MySQL-devel%{product_suffix} %package -n MySQL-devel%{product_suffix}
Summary: MySQL - Development header files and libraries Summary: MySQL - Development header files and libraries
Group: Applications/Databases Group: Applications/Databases
Provides: mysql-devel Provides: mysql-devel MySQL-devel
Obsoletes: mysql-devel MySQL-devel-community 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} %description -n MySQL-devel%{product_suffix}
This package contains the development header files and libraries necessary This package contains the development header files and libraries necessary
@ -351,10 +360,14 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
%package -n MySQL-shared%{product_suffix} %package -n MySQL-shared%{product_suffix}
Summary: MySQL - Shared libraries Summary: MySQL - Shared libraries
Group: Applications/Databases Group: Applications/Databases
Provides: mysql-shared Provides: mysql-shared MySQL-shared
Obsoletes: MySQL-shared-community 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} %description -n MySQL-shared%{product_suffix}
This package contains the shared libraries (*.so*) which certain languages 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} %package -n MySQL-embedded%{product_suffix}
Summary: MySQL - embedded library Summary: MySQL - Embedded library
Group: Applications/Databases Group: Applications/Databases
Requires: MySQL-devel%{product_suffix} Requires: MySQL-devel
Obsoletes: mysql-embedded MySQL-embedded-community 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} %description -n MySQL-embedded%{product_suffix}
This package contains the MySQL server as an embedded library. This package contains the MySQL server as an embedded library.
@ -1151,6 +1168,16 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %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> * Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to - Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to