Minor conditional fixes for ELN
This commit is contained in:
parent
c9e6813bbd
commit
3ebdabd841
@ -9,8 +9,8 @@
|
||||
%bcond_without bdb
|
||||
%endif
|
||||
|
||||
# Python 2 for F<32, Python 3 for F>=32
|
||||
%if 0%{?fedora} < 32
|
||||
# Python 2 for F<32, Python 3 for F>=32 and RHEL>=9
|
||||
%if 0%{?fedora} < 32 && 0%{?rhel} < 9
|
||||
%bcond_without python2
|
||||
%bcond_with python3
|
||||
%bcond_without pyswig
|
||||
@ -52,7 +52,7 @@
|
||||
Summary: A Modern Concurrent Version Control System
|
||||
Name: subversion
|
||||
Version: 1.14.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: ASL 2.0
|
||||
URL: https://subversion.apache.org/
|
||||
|
||||
@ -261,7 +261,7 @@ perl -pi -e 's|/usr/bin/env python.*|%{svn_python}|' subversion/tests/cmdline/sv
|
||||
export svn_cv_ruby_link="%{__cc} -shared"
|
||||
export svn_cv_ruby_sitedir_libsuffix=""
|
||||
export svn_cv_ruby_sitedir_archsuffix=""
|
||||
%if 0%{?fedora} >= 32
|
||||
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
|
||||
# Fix include path for ruby2.7
|
||||
export svn_cv_ruby_includes="-I%{_includedir}"
|
||||
%endif
|
||||
@ -565,6 +565,9 @@ make check-javahl
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu May 14 2020 Merlin Mathesius <mmathesi@redhat.com> - 1.14.0-3
|
||||
- Minor conditional fixes for ELN
|
||||
|
||||
* Wed Jun 3 2020 Joe Orton <jorton@redhat.com> - 1.14.0-2
|
||||
- use minor version as libtool library revision number
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user