From af4c4fa13c15597a94d9964a8ae1e2110269af10 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 14 Apr 2013 06:28:41 -0400 Subject: [PATCH] Exclude optional perl(YAML::Any) dependency on EL-5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream took great care to make use of YAML::Any optional¹. It's fine to pull it in on Fedora and EL >= 6, but it's not available for EL-5 so we'll just filter it from the requirements. ¹ git-svn: use YAML format for mergeinfo cache when possible https://github.com/git/git/commit/68f532f4b --- git.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index da201e1..5a1966b 100644 --- a/git.spec +++ b/git.spec @@ -16,6 +16,7 @@ %global docbook_suppress_sp 1 %global enable_ipv6 1 %global use_prebuilt_docs 1 +%global filter_yaml_any 1 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %else %global gitcoredir %{_libexecdir}/git-core @@ -25,6 +26,7 @@ %global docbook_suppress_sp 0 %global enable_ipv6 0 %global use_prebuilt_docs 0 +%global filter_yaml_any 0 %endif # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 @@ -310,10 +312,15 @@ echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid +# YAML::Any is optional and not available on el5 cat << \EOF > %{name}-req #!/bin/sh %{__perl_requires} $* |\ -sed -e '/perl(packed-refs)/d' +sed \ +%if %{filter_yaml_any} + -e '/perl(YAML::Any)/d' \ +%endif + -e '/perl(packed-refs)/d' EOF %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req @@ -559,6 +566,7 @@ rm -rf %{buildroot} %changelog * Sun Apr 14 2013 Todd Zullinger - 1.8.2.1-1 - Update to 1.8.2.1 +- Exclude optional perl(YAML::Any) dependency on EL-5 * Wed Apr 10 2013 Jon Ciesla - 1.8.2-3 - Drop desktop vendor tag for >= f19.