Bug#19155121 - Remove perl(GD) and dtrace dependencies and bench fix

parent 5773dfd3
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# #
/usr/lib/rpm/perl.req $* | /usr/lib/rpm/perl.req $* |
sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d' sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
...@@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} ...@@ -85,7 +85,7 @@ Name: mysql-%{product_suffix}
Summary: A very fast and reliable SQL database server Summary: A very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Version: @VERSION@ Version: @VERSION@
Release: 3%{?commercial:.1}%{?dist} Release: 4%{?commercial:.1}%{?dist}
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
URL: http://www.mysql.com/ URL: http://www.mysql.com/
...@@ -118,7 +118,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ...@@ -118,7 +118,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if 0%{?rhel} > 6 %if 0%{?rhel} > 6
# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::) %global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$ %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
%else %else
# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6 # https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
...@@ -273,8 +273,8 @@ Requires: mysql-enterprise-server%{?_isa} = %{version}-%{release} ...@@ -273,8 +273,8 @@ Requires: mysql-enterprise-server%{?_isa} = %{version}-%{release}
Requires: mysql-community-server%{?_isa} = %{version}-%{release} Requires: mysql-community-server%{?_isa} = %{version}-%{release}
%endif %endif
Obsoletes: mariadb-bench Obsoletes: mariadb-bench
Obsoletes: community-mysql-bench < %{obs_ver} Obsoletes: community-mysql-bench < %{version}-%{release}
Obsoletes: mysql-bench < %{obs_ver} Obsoletes: mysql-bench < %{version}-%{release}
Provides: mysql-bench = %{version}-%{release} Provides: mysql-bench = %{version}-%{release}
Provides: mysql-bench%{?_isa} = %{version}-%{release} Provides: mysql-bench%{?_isa} = %{version}-%{release}
...@@ -911,6 +911,9 @@ fi ...@@ -911,6 +911,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jul 08 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-4
- Remove perl(GD) and dtrace dependencies
* Tue Jul 01 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.39-3 * Tue Jul 01 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.39-3
- Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed - Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment