database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

Spec file for RPMs:

Browse Source 
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.

support-files/mysql.spec.sh:
  Introduce a new macro "vendor 2" and set it to Sun,
  so that we can have a whole series of vendors if such events continue.
This commit is contained in:
Joerg Bruehe
2010-03-01 11:42:44 +01:00
parent 3f484dbecf
commit a8c21d271f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
support-files/mysql.spec.sh
View File

@@ -21,7 +21,8 @@
# NOTE: "vendor" is used in upgrade/downgrade check, so you can't # NOTE: "vendor" is used in upgrade/downgrade check, so you can't
# change these, has to be exactly as is. # change these, has to be exactly as is.
%define mysql_old_vendor MySQL AB %define mysql_old_vendor MySQL AB
%define mysql_vendor Sun Microsystems, Inc. %define mysql_vendor_2 Sun Microsystems, Inc.
%define mysql_vendor Oracle and/or its affiliates
%define mysql_version @VERSION@ %define mysql_version @VERSION@
@@ -617,6 +618,7 @@ if [ $? -eq 0 -a -n "$installed" ]; then
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
myoldvendor='%{mysql_old_vendor}' myoldvendor='%{mysql_old_vendor}'
myvendor_2='%{mysql_vendor_2}'
myvendor='%{mysql_vendor}' myvendor='%{mysql_vendor}'
myversion='%{mysql_version}' myversion='%{mysql_version}'
@@ -628,10 +630,10 @@ if [ $? -eq 0 -a -n "$installed" ]; then
[ -z "$new_family" ] && new_family="<bad package specification: version $myversion>" [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
error_text= error_text=
if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor" ]; then if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor_2" -a "$vendor" != "$myvendor" ]; then
error_text="$error_text error_text="$error_text
The current MySQL server package is provided by a different The current MySQL server package is provided by a different
vendor ($vendor) than $myoldvendor or $myvendor. vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor.
Some files may be installed to different locations, including log Some files may be installed to different locations, including log
files and the service startup script in %{_sysconfdir}/init.d/. files and the service startup script in %{_sysconfdir}/init.d/.
" "
@@ -1036,6 +1038,11 @@ fi
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
accept upgrading from packages showing MySQL or Sun as vendor.
* Fri Feb 05 2010 Joerg Bruehe <joerg.bruehe@sun.com> * Fri Feb 05 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Formatting changes: - Formatting changes: