diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-07-08 13:55:42 +0200 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-07-08 13:55:42 +0200 |
| commit | b2521f52dd8591c12793995b22308379795df80d (patch) | |
| tree | 88e7e80f580fa2f13b349a9114f491bec80f28a7 /packaging | |
| parent | 5773dfd30bd1ce75d54a61eb4c7c9c291a0a9e57 (diff) | |
| download | mariadb-git-b2521f52dd8591c12793995b22308379795df80d.tar.gz | |
Bug#19155121 - Remove perl(GD) and dtrace dependencies and bench fix
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/rpm-oel/filter-requires.sh | 2 | ||||
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/packaging/rpm-oel/filter-requires.sh b/packaging/rpm-oel/filter-requires.sh index 521eb0ca7d9..3fdf43870fa 100755 --- a/packaging/rpm-oel/filter-requires.sh +++ b/packaging/rpm-oel/filter-requires.sh @@ -2,5 +2,5 @@ # /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' diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index bb596c35ac3..ba57515678c 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases 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. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -118,7 +118,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %if 0%{?rhel} > 6 # 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)$ %else # https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6 @@ -273,8 +273,8 @@ Requires: mysql-enterprise-server%{?_isa} = %{version}-%{release} Requires: mysql-community-server%{?_isa} = %{version}-%{release} %endif Obsoletes: mariadb-bench -Obsoletes: community-mysql-bench < %{obs_ver} -Obsoletes: mysql-bench < %{obs_ver} +Obsoletes: community-mysql-bench < %{version}-%{release} +Obsoletes: mysql-bench < %{version}-%{release} Provides: mysql-bench = %{version}-%{release} Provides: mysql-bench%{?_isa} = %{version}-%{release} @@ -911,6 +911,9 @@ fi %endif %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 - Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed |