Implement the change of RPM versioning and file naming:
- "release" starts from 1 - "level" ("m2", "rc", ...) is included in the RPM version.
This commit is contained in:
parent
a852f464e3
commit
3c9322e73f
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2000-2001, 2003-2006 MySQL AB
|
||||
# Copyright (C) 2000-2006 MySQL AB, 2008-2010 Sun Microsystems, Inc.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
@ -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_U_SCORE_VERSION''@!@MYSQL_U_SCORE_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@!' \
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||
# Copyright 2000-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -51,9 +51,9 @@
|
||||
%{!?_with_cluster:%define CLUSTER_BUILD 0}
|
||||
|
||||
%if %{STATIC_BUILD}
|
||||
%define release 0
|
||||
%define release 1
|
||||
%else
|
||||
%define release 0.glibc23
|
||||
%define release 1.glibc23
|
||||
%endif
|
||||
%define mysql_license GPL
|
||||
%define mysqld_user mysql
|
||||
@ -87,7 +87,7 @@
|
||||
Name: MySQL
|
||||
Summary: MySQL: a very fast and reliable SQL database server
|
||||
Group: Applications/Databases
|
||||
Version: @MYSQL_NO_DASH_VERSION@
|
||||
Version: @MYSQL_U_SCORE_VERSION@
|
||||
Release: %{release}
|
||||
License: Copyright 2000-2008 MySQL AB, @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
|
||||
@ -882,6 +882,12 @@ fi
|
||||
# itself - note that they must be ordered by date (important when
|
||||
# merging BK trees)
|
||||
%changelog
|
||||
* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
|
||||
|
||||
- Change RPM file naming:
|
||||
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
|
||||
- Release counts from 1, not 0.
|
||||
|
||||
* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
|
||||
|
||||
- Add conditionals for bundled zlib and innodb plugin
|
||||
|
Loading…
x
Reference in New Issue
Block a user