diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-01-13 12:28:42 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-01-13 12:28:42 +0200 |
| commit | 6e72f4171fbc157885672ab45152564cdd3d1bfa (patch) | |
| tree | cbdb25a3a54a2e4391cb90fb8e08590f44d099c8 /support-files | |
| parent | 4dc7be62a997a0176e300878d4b5e93865606029 (diff) | |
| parent | 23a3b911409ee7c27937a663ed7a08e13c0adbed (diff) | |
| download | mariadb-git-6e72f4171fbc157885672ab45152564cdd3d1bfa.tar.gz | |
merge 5.1-main to 5.1-bugteam
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 6c586d21a3c..6e7c6fd99ab 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -65,6 +65,19 @@ # See BUG#998 for details. %define _unpackaged_files_terminate_build 0 +# ------------------------------------------------------------------------------ +# RPM build tools now automatically detects Perl module dependencies. This +# detection gives problems as it is broken in some versions, and it also +# give unwanted dependencies from mandatory scripts in our package. +# Might not be possible to disable in all RPM tool versions, but here we +# try. We keep the "AutoReqProv: no" for the "test" sub package, as disabling +# here might fail, and that package has the most problems. +# See http://fedoraproject.org/wiki/Packaging/Perl#Filtering_Requires:_and_Provides +# http://www.wideopen.com/archives/rpm-list/2002-October/msg00343.html +# ------------------------------------------------------------------------------ +%undefine __perl_provides +%undefine __perl_requires + %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com # On SuSE 9 no separate "debuginfo" package is built. To enable basic @@ -205,7 +218,7 @@ They should be used with caution. %endif %package test -Requires: %{name}-client perl-DBI perl +Requires: %{name}-client perl Summary: MySQL - Test suite Group: Applications/Databases Provides: mysql-test |