database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Change RPM file naming:

Browse Source 
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
This commit is contained in:
Joerg Bruehe
2009-12-22 23:22:42 +01:00
parent f23b17696c
commit a10699754f
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -31,12 +31,14 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# 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|\.[[^.]]*$||"`
@ -74,6 +76,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)

28
support-files/MySQL-shared-compat.spec.sh
View File

@ -1,3 +1,4 @@
# Copyright 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
# #
# MySQL-shared-compat.spec # MySQL-shared-compat.spec
# #
@ -7,8 +8,6 @@
# separate "MySQL-shared" package. This spec file simply repackages two # separate "MySQL-shared" package. This spec file simply repackages two
# already existing MySQL-shared RPMs into a single package. # already existing MySQL-shared RPMs into a single package.
# #
# Copyright (C) 2003 MySQL AB
#
# This program is free software; you can redistribute it and/or modify it # 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 the Free # under the terms of the GNU General Public License as published by the Free
# Software Foundation; version 2 of the License. # Software Foundation; version 2 of the License.
@ -28,27 +27,27 @@
# #
# Change this to match the version of the shared libs you want to include # Change this to match the version of the shared libs you want to include
# #
%define version50 @MYSQL_NO_DASH_VERSION@ %define version_cur @MYSQL_U_SCORE_VERSION@
%define version41 4.1.17 %define version41 4.1.17
%define version40 4.0.26 %define version40 4.0.26
%define version3 3.23.58 %define version3 3.23.58
Name: MySQL-shared-compat Name: MySQL-shared-compat
Packager: MySQL Product Engineering team <build@mysql.com> Packager: Sun Microsystems, Inc. Product Engineering Team <build@mysql.com>
Vendor: MySQL AB Vendor: Sun Microsystems, Inc.
License: GPL License: GPL
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com/ URL: http://www.mysql.com/
Autoreqprov: on Autoreqprov: on
Version: %{version50} Version: %{version_cur}
Release: 0 Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: MySQL-shared, mysql-shared Obsoletes: MySQL-shared, mysql-shared
Provides: MySQL-shared Provides: MySQL-shared
Summary: MySQL shared client libraries for MySQL %{version}, %{version41}, %{version40} and %{version3} Summary: MySQL shared client libraries for MySQL %{version}, %{version41}, %{version40} and %{version3}
# We simply use the "MySQL-shared" subpackages as input sources instead of # We simply use the "MySQL-shared" subpackages as input sources instead of
# rebuilding all from source # rebuilding all from source
Source0: MySQL-shared-%{version50}-0.%{_arch}.rpm Source0: MySQL-shared-%{version_cur}-1.%{_arch}.rpm
Source1: MySQL-shared-%{version41}-1.%{_arch}.rpm Source1: MySQL-shared-%{version41}-1.%{_arch}.rpm
Source2: MySQL-shared-%{version40}-0.%{_arch}.rpm Source2: MySQL-shared-%{version40}-0.%{_arch}.rpm
Source3: MySQL-shared-%{version3}-1.%{_arch}.rpm Source3: MySQL-shared-%{version3}-1.%{_arch}.rpm
@ -62,7 +61,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This package includes the shared libraries for MySQL %{version3}, This package includes the shared libraries for MySQL %{version3},
MySQL %{version40}, %{version41} as well as MySQL %{version50}. MySQL %{version40}, %{version41} as well as MySQL %{version_cur}.
Install this package instead of "MySQL-shared", if you have applications Install this package instead of "MySQL-shared", if you have applications
installed that are dynamically linked against older versions of the MySQL installed that are dynamically linked against older versions of the MySQL
client library but you want to upgrade to MySQL %{version} without breaking the client library but you want to upgrade to MySQL %{version} without breaking the
@ -84,3 +83,14 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-directories
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libmysqlclient* %{_libdir}/libmysqlclient*
# The spec file changelog only includes changes made to the spec file
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
* Tue Dec 22 2009 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.

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

@ -1,4 +1,4 @@
# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. # Copyright 2000-2008 MySQL AB, 2008-2009 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
@ -50,9 +50,9 @@
%{!?malloc_lib_target:%define WITH_TCMALLOC 0} %{!?malloc_lib_target:%define WITH_TCMALLOC 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 mysql_license GPL %define mysql_license GPL
%define mysqld_user mysql %define mysqld_user mysql
@ -86,7 +86,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: 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. 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 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 # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Tue Dec 22 2009 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 Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com> * Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
- Fix some problems with the directives around "tcmalloc" (experimental), - Fix some problems with the directives around "tcmalloc" (experimental),