List:Commits« Previous MessageNext Message »
From:MySQL Build Team Date:February 24 2009 4:56pm
Subject:bzr push into mysql-5.1-bugteam branch (build:2792 to 2793)
View as plain text  
 2793 kent.boortz@stripped	2009-02-24
      Insert current year as last copyright year for the product
      Don't use both "License" and "license" as RPM macro, they are the same
modified:
  configure.in
  support-files/Makefile.am
  support-files/mysql.spec.sh

 2792 Timothy Smith	2009-02-07 [merge]
      Auto-merge up from 5.0
modified:
  mysql-test/r/func_sapdb.result
  mysql-test/t/func_sapdb.test
  netware/Makefile.am
  sql/item_timefunc.h

=== modified file 'configure.in'
--- a/configure.in	2009-02-07 15:50:31 +0000
+++ b/configure.in	2009-02-24 16:54:03 +0000
@@ -36,6 +36,7 @@ MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DA
 MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
 MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \
     awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
+MYSQL_COPYRIGHT_YEAR=`date '+%Y'`
 
 # Add previous major version for debian package upgrade path
 MYSQL_PREVIOUS_BASE_VERSION=5.0
@@ -70,6 +71,7 @@ AC_SUBST(MYSQL_NO_DASH_VERSION)
 AC_SUBST(MYSQL_BASE_VERSION)
 AC_SUBST(MYSQL_VERSION_ID)
 AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION)
+AC_SUBST(MYSQL_COPYRIGHT_YEAR)
 AC_SUBST(PROTOCOL_VERSION)
 AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
                    [mysql client protocol version])

=== modified file 'support-files/Makefile.am'
--- a/support-files/Makefile.am	2008-01-24 18:04:48 +0000
+++ b/support-files/Makefile.am	2009-02-24 16:54:03 +0000
@@ -119,6 +119,7 @@ SUFFIXES = .sh
 	  -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
 	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
 	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
+	  -e 's!@''MYSQL_COPYRIGHT_YEAR''@!@MYSQL_COPYRIGHT_YEAR@!' \
 	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 	  -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
 	  -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2008-12-28 07:00:23 +0000
+++ b/support-files/mysql.spec.sh	2009-02-24 16:54:03 +0000
@@ -41,7 +41,7 @@
 %else
 %define release 0.glibc23
 %endif
-%define license GPL
+%define mysql_license	GPL
 %define mysqld_user	mysql
 %define mysqld_group	mysql
 %define server_suffix -standard
@@ -75,7 +75,7 @@ Summary:	MySQL: a very fast and reliable
 Group:		Applications/Databases
 Version:	@MYSQL_NO_DASH_VERSION@
 Release:	%{release}
-License:	Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.  All rights reserved.  Use is subject to license terms.  Under %{license} license as shown in the Description field.
+License:	Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc.  All rights reserved.  Use is subject to license terms.  Under %{mysql_license} license as shown in the Description field.
 Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
 URL:		http://www.mysql.com/
 Packager:	Sun Microsystems, Inc. Product Engineering Team <build@stripped>
@@ -96,7 +96,7 @@ is intended for mission-critical, heavy-
 as for embedding into mass-deployed software. MySQL is a trademark of
 Sun Microsystems, Inc.
 
-Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc.  All rights reserved.
 Use is subject to license terms.
 
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
@@ -120,7 +120,7 @@ is intended for mission-critical, heavy-
 as for embedding into mass-deployed software. MySQL is a trademark of
 Sun Microsystems, Inc.
 
-Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2000-2008 MySQL AB, 2008-@MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc.  All rights reserved.
 Use is subject to license terms.
 
 This software comes with ABSOLUTELY NO WARRANTY. This is free software,
@@ -366,7 +366,7 @@ CFLAGS="$CFLAGS" \
 CXXFLAGS="$CXXFLAGS" \
 BuildMySQL "\
 		--with-debug \
-		--with-comment=\"MySQL Community Server - Debug (%{license})\"")
+		--with-comment=\"MySQL Community Server - Debug (%{mysql_license})\"")
 
 # We might want to save the config log file
 if test -n "$MYSQL_DEBUGCONFLOG_DEST"
@@ -387,7 +387,7 @@ CFLAGS="$CFLAGS" \
 CXXFLAGS="$CXXFLAGS" \
 BuildMySQL "\
 		--with-embedded-server \
-		--with-comment=\"MySQL Community Server (%{license})\"")
+		--with-comment=\"MySQL Community Server (%{mysql_license})\"")
 # We might want to save the config log file
 if test -n "$MYSQL_CONFLOG_DEST"
 then

Thread
bzr push into mysql-5.1-bugteam branch (build:2792 to 2793) MySQL Build Team24 Feb