rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Exclude optional perl(YAML::Any) dependency on EL-5

Browse Source 
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
This commit is contained in:
Todd Zullinger 2013-04-14 06:28:41 -04:00
parent b89c4c66e4
commit af4c4fa13c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git.spec
View File

@ -16,6 +16,7 @@
%global docbook_suppress_sp 1 %global docbook_suppress_sp 1
%global enable_ipv6 1 %global enable_ipv6 1
%global use_prebuilt_docs 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())")} %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%else %else
%global gitcoredir %{_libexecdir}/git-core %global gitcoredir %{_libexecdir}/git-core
@ -25,6 +26,7 @@
%global docbook_suppress_sp 0 %global docbook_suppress_sp 0
%global enable_ipv6 0 %global enable_ipv6 0
%global use_prebuilt_docs 0 %global use_prebuilt_docs 0
%global filter_yaml_any 0
%endif %endif
# Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 # 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 # Filter bogus perl requires
# packed-refs comes from a comment in contrib/hooks/update-paranoid # packed-refs comes from a comment in contrib/hooks/update-paranoid
# YAML::Any is optional and not available on el5
cat << \EOF > %{name}-req cat << \EOF > %{name}-req
#!/bin/sh #!/bin/sh
%{__perl_requires} $* |\ %{__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 EOF
%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req %global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
@ -559,6 +566,7 @@ rm -rf %{buildroot}
%changelog %changelog
* Sun Apr 14 2013 Todd Zullinger <tmz@pobox.com> - 1.8.2.1-1 * Sun Apr 14 2013 Todd Zullinger <tmz@pobox.com> - 1.8.2.1-1
- Update to 1.8.2.1 - Update to 1.8.2.1
- Exclude optional perl(YAML::Any) dependency on EL-5
* Wed Apr 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.8.2-3 * Wed Apr 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.8.2-3
- Drop desktop vendor tag for >= f19. - Drop desktop vendor tag for >= f19.