mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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:
13
configure.in
13
configure.in
@ -30,12 +30,14 @@ NDB_VERSION_STATUS=""
|
|||||||
# Remember that regexps needs to quote [ and ] since this is run through m4
|
# Remember that regexps needs to quote [ and ] since this is run through m4
|
||||||
# We take some made up examples
|
# We take some made up examples
|
||||||
#
|
#
|
||||||
# VERSION 5.1.40sp1-alpha 5.0.34a
|
# VERSION 5.1.40sp1-alpha 5.0.34a 5.5.1-m2
|
||||||
# MYSQL_NO_DASH_VERSION 5.1.40sp1 5.0.34a
|
# MYSQL_U_SCORE_VERSION 5.1.40sp1_alpha 5.0.34a 5.5.1_m2
|
||||||
# MYSQL_NUMERIC_VERSION 5.1.40 5.0.34
|
# MYSQL_NO_DASH_VERSION 5.1.40sp1 5.0.34a 5.5.1
|
||||||
# MYSQL_BASE_VERSION 5.1 5.0
|
# MYSQL_NUMERIC_VERSION 5.1.40 5.0.34 5.5.1
|
||||||
# MYSQL_VERSION_ID 50140 50034
|
# MYSQL_BASE_VERSION 5.1 5.0 5.5
|
||||||
|
# MYSQL_VERSION_ID 50140 50034 50501
|
||||||
#
|
#
|
||||||
|
MYSQL_U_SCORE_VERSION=`echo $VERSION | sed -e "s|-|_|"`
|
||||||
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
|
MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
|
||||||
MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
|
MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
|
||||||
MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
|
MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
|
||||||
@ -78,6 +80,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
|
|||||||
#####
|
#####
|
||||||
#####
|
#####
|
||||||
|
|
||||||
|
AC_SUBST(MYSQL_U_SCORE_VERSION)
|
||||||
AC_SUBST(MYSQL_NO_DASH_VERSION)
|
AC_SUBST(MYSQL_NO_DASH_VERSION)
|
||||||
AC_SUBST(MYSQL_BASE_VERSION)
|
AC_SUBST(MYSQL_BASE_VERSION)
|
||||||
AC_SUBST(MYSQL_VERSION_ID)
|
AC_SUBST(MYSQL_VERSION_ID)
|
||||||
|
@ -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
|
# This library is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU Library General Public
|
# modify it under the terms of the GNU Library General Public
|
||||||
@ -104,6 +104,7 @@ SUFFIXES = .sh
|
|||||||
-e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
|
-e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
|
||||||
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
|
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
|
||||||
-e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
|
-e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_U_SCORE_VERSION''@!@MYSQL_U_SCORE_VERSION@!' \
|
||||||
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
||||||
-e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
|
-e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
|
||||||
-e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
|
-e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (C) 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
# Copyright (C) 2000-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -28,9 +28,9 @@
|
|||||||
%{!?_with_yassl:%define YASSL_BUILD 0}
|
%{!?_with_yassl:%define YASSL_BUILD 0}
|
||||||
|
|
||||||
%if %{STATIC_BUILD}
|
%if %{STATIC_BUILD}
|
||||||
%define release 0
|
%define release 1
|
||||||
%else
|
%else
|
||||||
%define release 0.glibc23
|
%define release 1.glibc23
|
||||||
%endif
|
%endif
|
||||||
%define license GPL
|
%define license GPL
|
||||||
%define mysqld_user mysql
|
%define mysqld_user mysql
|
||||||
@ -64,7 +64,7 @@
|
|||||||
Name: MySQL
|
Name: MySQL
|
||||||
Summary: MySQL: a very fast and reliable SQL database server
|
Summary: MySQL: a very fast and reliable SQL database server
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Version: @MYSQL_NO_DASH_VERSION@
|
Version: @MYSQL_U_SCORE_VERSION@
|
||||||
Release: %{release}
|
Release: %{release}
|
||||||
License: %{license}
|
License: %{license}
|
||||||
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
|
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
|
||||||
@ -818,6 +818,12 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%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.
|
||||||
|
|
||||||
* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
|
* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
- Correct yesterday's fix, so that it also works for the last flag.
|
- Correct yesterday's fix, so that it also works for the last flag.
|
||||||
|
Reference in New Issue
Block a user