bk commit into 5.0 tree (joerg:1.2305)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-16 14:38:15+01:00, joerg@trift2. +1 -0
  Merge trift2.:/MySQL/M41/bug22081-4.1
  into  trift2.:/MySQL/M50/bug22081-5.0
  MERGE: 1.1616.2838.11

  support-files/mysql.spec.sh@stripped, 2006-11-16 14:38:12+01:00, joerg@trift2. +6 -6
    Manual merge, bug#22081.
    MERGE: 1.83.1.43

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/bug22081-5.0/RESYNC

--- 1.156/support-files/mysql.spec.sh	2006-11-16 14:38:21 +01:00
+++ 1.157/support-files/mysql.spec.sh	2006-11-16 14:38:21 +01:00
@@ -194,6 +194,8 @@
 %package shared
 Summary: MySQL - Shared libraries
 Group: Applications/Databases
+Provides: mysql-shared
+Obsoletes: mysql-shared
 
 %description shared
 This package contains the shared libraries (*.so*) which certain
@@ -751,6 +753,12 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Thu Nov 16 2006 Joerg Bruehe <joerg@stripped>
+
+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) 
+  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
+  (bug#22081).
+
 * Wed Nov 15 2006 Joerg Bruehe <joerg@stripped>
 
 - Switch from "make test*" to explicit calls of the test suite,