From 5f858eef066a49d70cf8bcd8f09af77c5a2016aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Wed, 30 Jan 2013 14:45:15 +0100 Subject: [PATCH] Adding necessary hacks for perl dependency checking, rpm is still not wise enough --- filter-requires-mysql.sh | 5 +++++ mariadb.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 filter-requires-mysql.sh diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh new file mode 100755 index 0000000..bce04c6 --- /dev/null +++ b/filter-requires-mysql.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | \ + grep -v -e "perl(th" \ + -e "perl(lib::mtr" -e "perl(lib::v1/mtr" -e "perl(mtr" diff --git a/mariadb.spec b/mariadb.spec index 23a11d3..f1354f8 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,6 +1,6 @@ Name: mariadb Version: 5.5.28a -Release: 6%{?dist} +Release: 7%{?dist} Summary: A community developed branch of MySQL Group: Applications/Databases @@ -35,6 +35,8 @@ Source14: rh-skipped-tests-base.list Source15: rh-skipped-tests-arm.list # mysql_plugin is missing in mariadb tar ball Source16: mysql_plugin.1 +# Working around perl dependency checking bug in rpm FTTB. Remove later. +Source999: filter-requires-mysql.sh # Comments for these patches are in the patch files. Patch1: mariadb-errno.patch @@ -76,6 +78,10 @@ Conflicts: mysql %endif # mysql-cluster used to be built from this SRPM, but no more Obsoletes: mysql-cluster < 5.1.44 + +# When rpm 4.9 is universal, this could be cleaned up: +%global __perl_requires %{SOURCE999} +%global __perllib_requires %{SOURCE999} # patch utility does automatically back-up of chunks that didn't apply # smoothly, but we don't want to create that files because they could be @@ -745,6 +751,10 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed Jan 30 2013 Honza Horak 5.5.28a-7 +- Adding necessary hacks for perl dependency checking, rpm is still + not wise enough + * Mon Jan 28 2013 Honza Horak 5.5.28a-6 - Removed %%{_isa} from provides/obsoletes, which doesn't allow proper obsoleting