]> review.fuel-infra Code Review - packages/centos7/MySQL-wsrep.git/commitdiff
Set epoch for all provides 41/15441/1
authorIvan Suzdal <isuzdal@mirantis.com>
Tue, 22 Dec 2015 18:21:12 +0000 (21:21 +0300)
committerIvan Suzdal <isuzdal@mirantis.com>
Tue, 22 Dec 2015 18:21:12 +0000 (21:21 +0300)
Change-Id: I8e621b7cad7175b8cf575e917cbf9fd01780e977

mysql.spec

index b1155eaa019d45c61a940d910c814a672d912207..51c5e49a045682050e4d5451a96af58984549eb2 100644 (file)
@@ -201,7 +201,7 @@ Summary:        MySQL: a very fast and reliable SQL database server
 Group:          Applications/Databases
 Version:        5.6.23_wsrep_25.10
 Epoch:          1
-Release:        %{release}%{?dist}~mos5
+Release:        %{release}%{?dist}~mos6
 # Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2015, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
 Source0:        mysql-5.6.23.tar.gz
@@ -294,8 +294,8 @@ Obsoletes:      mysql-server-advanced
 Obsoletes:      MySQL-server-classic MySQL-server-community MySQL-server-enterprise
 Obsoletes:      MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
 Obsoletes:      mariadb-libs mariadb-server
-Provides:       mysql-server = %{version}-%{release}
-Provides:       mysql-server%{?_isa} = %{version}-%{release}
+Provides:       mysql-server = %{epoch}:%{version}-%{release}
+Provides:       mysql-server%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:       MySQL-server-wsrep
 
 %description -n mysql-wsrep-server%{product_suffix}
@@ -337,10 +337,10 @@ Obsoletes:      mysql < %{version}-%{release}
 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}
+Provides:       mysql = %{epoch}:%{version}-%{release}
+Provides:       mysql%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:       MySQL-client-wsrep
-Provides:       mysql-client = %{version}-%{release}
+Provides:       mysql-client = %{epoch}:%{version}-%{release}
 
 %description -n mysql-wsrep-client%{product_suffix}
 This package contains the standard MySQL clients and administration tools.
@@ -364,8 +364,8 @@ Obsoletes:      mysql-test < %{version}-%{release}
 Obsoletes:      mysql-test-advanced
 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}
+Provides:       mysql-test = %{epoch}:%{version}-%{release}
+Provides:       mysql-test%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:       MySQL-test-wsrep
 AutoReqProv:    no
 
@@ -387,8 +387,8 @@ 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}
+Provides:       mysql-devel = %{epoch}:%{version}-%{release}
+Provides:       mysql-devel%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:       MySQL-devel-wsrep
 
 %description -n mysql-wsrep-devel%{product_suffix}
@@ -406,7 +406,7 @@ Obsoletes:      MySQL-shared
 %else
 Obsoletes:      MySQL-shared-advanced
 %endif
-Provides:       mysql-libs
+Provides:       mysql-libs = %{epoch}:%{version}-%{release}
 Provides:       MySQL-shared-wsrep
 Obsoletes:      MySQL-shared-standard MySQL-shared-pro
 Obsoletes:      MySQL-shared-pro-cert MySQL-shared-pro-gpl
@@ -1252,7 +1252,7 @@ echo "====="                                     >> $STATUS_HISTORY
 # merging BK trees)
 ##############################################################################
 %changelog
-* Tue Dec 22 2015 Ivan Suzdal <isuzdal@mirantis.com> - 1:5.6.23-25.10%{?dist}~mos8.0.5
+* Tue Dec 22 2015 Ivan Suzdal <isuzdal@mirantis.com> - 1:5.6.23-25.10%{?dist}~mos8.0.6
 - Add epoch
 
 * Fri Oct  2 2015 Ivan Suzdal <isuzdal@mirantis.com> - 5.6.23-25.10%{?dist}~mos8.0.4