summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mysql.5.5.18.spec (renamed from mysql.5.5.17.spec)85
-rw-r--r--mysql55.spec6
2 files changed, 61 insertions, 30 deletions
diff --git a/mysql.5.5.17.spec b/mysql.5.5.18.spec
index b4edf8a..9c97b64 100644
--- a/mysql.5.5.17.spec
+++ b/mysql.5.5.18.spec
@@ -24,7 +24,7 @@
%define mysql_vendor_2 Sun Microsystems, Inc.
%define mysql_vendor Oracle and/or its affiliates
-%define mysql_version 5.5.17
+%define mysql_version 5.5.18
%define mysqld_user mysql
%define mysqld_group mysql
@@ -241,7 +241,7 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.17
+Version: 5.5.18
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
License: Copyright (c) 2000, 2011, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
@@ -280,11 +280,13 @@ documentation and the manual for more information.
##############################################################################
%package -n MySQL-server%{product_suffix}
-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
+Summary: MySQL: a very fast and reliable SQL database server
+Group: Applications/Databases
+Requires: %{distro_requires}
+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,
@@ -312,10 +314,12 @@ 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
+Summary: MySQL - Client
+Group: Applications/Databases
+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,12 +328,15 @@ 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
-AutoReqProv: no
+Summary: MySQL - Test suite
+Group: Applications/Databases
+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}
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}
-Summary: MySQL - Development header files and libraries
-Group: Applications/Databases
-Provides: mysql-devel
-Obsoletes: mysql-devel MySQL-devel-community
+Summary: MySQL - Development header files and libraries
+Group: Applications/Databases
+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
@@ -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}
-Summary: MySQL - Shared libraries
-Group: Applications/Databases
-Provides: mysql-shared
-Obsoletes: MySQL-shared-community
+Summary: MySQL - Shared libraries
+Group: Applications/Databases
+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
-Group: Applications/Databases
-Requires: MySQL-devel%{product_suffix}
-Obsoletes: mysql-embedded MySQL-embedded-community
+Summary: MySQL - Embedded library
+Group: Applications/Databases
+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.
@@ -1133,6 +1150,16 @@ echo "=====" >> $STATUS_HISTORY
- Fix duplicate mentioning of "mysql_plugin" and its manual page,
it is better to keep alphabetic order in the files list (merging!).
+
+* 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>
diff --git a/mysql55.spec b/mysql55.spec
index e4fba58..83911d0 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -1,5 +1,5 @@
Name: mysql
-Version: 5.5.17
+Version: 5.5.18
Release: 1%{?dist}
# NOTE: Our convention for the life of F15 is that sysv packages will be
# numbered 1dist.n while systemd packages will be 2dist and higher.
@@ -687,6 +687,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Mon Nov 21 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.5.18-1
+- update to MySQL 5.5.18 Community Server GA
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-18.html
+
* Sat Oct 22 2011 Remi Collet <RPMS@FamilleCollet.com> - 5.5.17-1
- update to MySQL 5.5.17 Community Server GA
http://dev.mysql.com/doc/refman/5.5/en/news-5-5-17.html