List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 19 2006 9:44am
Subject:bk commit into 5.0 tree (joerg:1.1986)
View as plain text  
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

  1.1986 06/01/19 10:44:44 joerg@stripped +1 -0
  Update the spec file for the shared compat RPM with version info.

    1.7 06/01/19 10:44:39 joerg@stripped +7 -4
    Prevent "libndbclient" (which is not included in the "shared compat" RPM)
    from breaking the RPM packaging.
    Also, adapt the specification to the newer versions of the older release families.
    This needs to be repeated periodically.
    Take care of the RPM build version: For 4.1.16, it is 4.1.16-1 !

# 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:	/M50/push-5.0

--- 1.6/support-files/	2005-01-13 13:20:30 +01:00
+++ 1.7/support-files/	2006-01-19 10:44:39 +01:00
@@ -23,16 +23,19 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59
 # Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# For 5.0 and up, this is needed because of "libndbclient".
+%define _unpackaged_files_terminate_build 0
 # Change this to match the version of the shared libs you want to include
 %define version50 @MYSQL_NO_DASH_VERSION@
-%define version41 4.1.9
-%define version40 4.0.23
+%define version41 4.1.16
+%define version40 4.0.26
 %define version3 3.23.58
 Name:         MySQL-shared-compat
-Packager:     Lenz Grimmer <build@stripped>
+Packager:     MySQL Product Engineering team <build@stripped>
 Vendor:       MySQL AB
 License:      GPL
 Group:        Applications/Databases
@@ -47,7 +50,7 @@
 # We simply use the "MySQL-shared" subpackages as input sources instead of
 # rebuilding all from source
 Source0:      MySQL-shared-%{version50}-0.%{_arch}.rpm
-Source1:      MySQL-shared-%{version41}-0.%{_arch}.rpm
+Source1:      MySQL-shared-%{version41}-1.%{_arch}.rpm
 Source2:      MySQL-shared-%{version40}-0.%{_arch}.rpm
 Source3:      MySQL-shared-%{version3}-1.%{_arch}.rpm
 # No need to include the RPMs once more - they can be downloaded seperately
bk commit into 5.0 tree (joerg:1.1986)Joerg Bruehe19 Jan