diff options
| -rw-r--r-- | mysql.5.5.34.spec (renamed from mysql.5.5.33.spec) | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/mysql.5.5.33.spec b/mysql.5.5.34.spec index bd81416..11e9f9d 100644 --- a/mysql.5.5.33.spec +++ b/mysql.5.5.34.spec @@ -24,13 +24,14 @@ %global mysql_vendor_2 Sun Microsystems, Inc. %global mysql_vendor Oracle and/or its affiliates -%global mysql_version 5.5.33 +%global mysql_version 5.5.34 %global mysqld_user mysql %global mysqld_group mysql %global mysqldatadir /var/lib/mysql -%define release 1 +%global release 1 + # # Macros we use which are not available in all supported versions of RPM @@ -226,7 +227,7 @@ # Configuration based upon above user input, not to be set directly ############################################################################## -%if %{commercial} +%if 0%{?commercial} %define license_files_server %{src_dir}/LICENSE.mysql %define license_type Commercial %else @@ -241,7 +242,7 @@ Name: MySQL%{product_suffix} Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases -Version: 5.5.33 +Version: 5.5.34 Release: %{release}%{?distro_releasetag:.%{distro_releasetag}} Distribution: %{distro_description} License: Copyright (c) 2000, 2013, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field. @@ -249,7 +250,6 @@ Source: http://www.mysql.com/Downloads/MySQL-5.5/%{src_dir}.tar.gz URL: http://www.mysql.com/ Packager: MySQL Release Engineering <mysql-build@oss.oracle.com> Vendor: %{mysql_vendor} -Provides: msqlormysql MySQL-server BuildRequires: %{distro_buildreq} # Regression tests may take a long time, override the default to skip them @@ -291,9 +291,12 @@ Obsoletes: MySQL-server %else Obsoletes: MySQL-server-advanced %endif -Obsoletes: mysql-server mysql-advanced mysql-server-advanced +Obsoletes: mysql-server < %{version}-%{release} +Obsoletes: mysql-server-advanced Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise Obsoletes: MySQL-server-advanced-gpl MySQL-server-enterprise-gpl +Provides: mysql-server = %{version}-%{release} +Provides: mysql-server%{?_isa} = %{version}-%{release} %description -n MySQL-server%{product_suffix} The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, @@ -333,7 +336,7 @@ Obsoletes: mysql-advanced < %{version}-%{release} Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise Obsoletes: MySQL-client-advanced-gpl MySQL-client-enterprise-gpl Provides: mysql = %{version}-%{release} - +Provides: mysql%{?_isa} = %{version}-%{release} %description -n MySQL-client%{product_suffix} This package contains the standard MySQL clients and administration tools. @@ -351,10 +354,13 @@ Obsoletes: MySQL-test Requires: MySQL-client perl Obsoletes: MySQL-test-advanced %endif -Obsoletes: mysql-test mysql-test-advanced +Obsoletes: mysql-test < %{version}-%{release} +Obsoletes: mysql-test-advanced Obsoletes: mysql-bench MySQL-bench Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise Obsoletes: MySQL-test-advanced-gpl MySQL-test-enterprise-gpl +Provides: mysql-test = %{version}-%{release} +Provides: mysql-test%{?_isa} = %{version}-%{release} AutoReqProv: no %description -n MySQL-test%{product_suffix} @@ -371,10 +377,12 @@ Obsoletes: MySQL-devel %else Obsoletes: MySQL-devel-advanced %endif -Obsoletes: mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced +Obsoletes: mysql-devel < %{version}-%{release} +Obsoletes: mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise Obsoletes: MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl - +Provides: mysql-devel = %{version}-%{release} +Provides: mysql-devel%{?_isa} = %{version}-%{release} %description -n MySQL-devel%{product_suffix} This package contains the development header files and libraries necessary @@ -412,10 +420,13 @@ Obsoletes: MySQL-embedded Requires: MySQL-devel Obsoletes: MySQL-embedded-advanced %endif -Obsoletes: mysql-embedded mysql-embedded-advanced +Obsoletes: mysql-embedded < %{version}-%{release} +Obsoletes: mysql-embedded-advanced Obsoletes: MySQL-embedded-pro Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl +Provides: mysql-embedded = %{version}-%{release} +Provides: mysql-emdedded%{?_isa} = %{version}-%{release} %description -n MySQL-embedded%{product_suffix} This package contains the MySQL server as an embedded library. @@ -707,7 +718,7 @@ fi # We assume that if there is exactly one ".pid" file, # it contains the valid PID of a running MySQL server. -NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | wc -l` +NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l` case $NR_PID_FILES in 0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server 1 ) SERVER_TO_START='true' ;; @@ -1204,6 +1215,12 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> +- Updated logic to get the correct count of PID files + +* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> +- Added provides lowercase mysql tags + * Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - Cleaned up spec file to resolve rpm dependencies. |