List:Commits« Previous MessageNext Message »
From:rparranovo Date:December 12 2005 8:29pm
Subject:bk commit into 5.0 tree (rparranovo:1.1970)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of novo. When novo 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
  1.1970 05/12/12 17:29:02 rparranovo@stripped +1 -0
  mysql.spec.sh:
    * made the following changes for the generic 5.0 RPM spec file
    - Added zlib to the list of (static) libraries installed
    - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
    - Compile MySQL with bundled zlib
    - Fixed %packager name to "MySQL Production Engineering Team"

  support-files/mysql.spec.sh
    1.130 05/12/12 17:25:33 novo@yakko.(none) +24 -4
    * made the following changes for the generic 5.0 RPM spec file
    - Added zlib to the list of (static) libraries installed
    - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
    - Compile MySQL with bundled zlib
    - Fixed %packager name to "MySQL Production Engineering Team"

# 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:	rparranovo
# Host:	yakko.(none)
# Root:	/home/novo/MySQL/mysql-5.0

--- 1.129/support-files/mysql.spec.sh	2005-12-05 14:33:43 -03:00
+++ 1.130/support-files/mysql.spec.sh	2005-12-12 17:25:33 -03:00
@@ -35,7 +35,7 @@
 License:	%{license}
 Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
 URL:		http://www.mysql.com/
-Packager:	Lenz Grimmer <build@stripped>
+Packager:	MySQL Production Engineering Team <build@stripped>
 Vendor:		MySQL AB
 Provides:	msqlormysql MySQL-server mysql
 BuildRequires: ncurses-devel
@@ -325,7 +325,13 @@
 make test-force || true
 
 # Save mysqld-max
-mv sql/mysqld sql/mysqld-max
+# check if mysqld was installed in .libs/
+if test -f sql/.libs/mysqld
+then
+	cp sql/.libs/mysqld sql/mysqld-max
+else
+	cp sql/mysqld sql/mysqld-max
+fi
 nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
 # Save the perror binary so it supports the NDB error codes (BUG#13740)
 mv extra/perror extra/perror.ndb
@@ -363,14 +369,19 @@
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
 %else
-		--with-zlib-dir=bundled \
 %endif
+		--with-zlib-dir=bundled \
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--with-archive-storage-engine \
 		--with-innodb \
 		--with-big-tables"
-nm --numeric-sort sql/mysqld > sql/mysqld.sym
+if test -f sql/.libs/mysqld
+then
+	nm --numeric-sort sql/.libs/mysqld > sql/mysqld.sym
+else
+	nm --numeric-sort sql/mysqld > sql/mysqld.sym
+fi
 
 # We might want to save the config log file
 if test -n "$MYSQL_CONFLOG_DEST"
@@ -679,6 +690,8 @@
 %{_libdir}/mysql/libndbclient.a
 %{_libdir}/mysql/libndbclient.la
 %{_libdir}/mysql/libvio.a
+%{_libdir}/mysql/libz.a
+%{_libdir}/mysql/libz.la
 
 %files shared
 %defattr(-, root, root, 0755)
@@ -707,6 +720,13 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Fri Dec 12 2005 Rodrigo Novo <rodrigo@stripped>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %packager name to "MySQL Production Engineering Team"
+
 * Mon Dec 05 2005 Joerg Bruehe <joerg@stripped>
 
 - Avoid using the "bundled" zlib on "shared" builds: 
Thread
bk commit into 5.0 tree (rparranovo:1.1970)rparranovo12 Dec