!3 update version to 1.14.0

Merge pull request !3 from 杨壮壮/master
This commit is contained in:
openeuler-ci-bot 2020-08-01 14:10:08 +08:00 committed by Gitee
commit 1d5d5a485e
2 changed files with 24 additions and 16 deletions

View File

@ -2,15 +2,15 @@
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%global svn_python_sitearch %{python2_sitearch} %global svn_python_sitearch %{python3_sitearch}
%global svn_python %{__python2} %global svn_python %{__python3}
%bcond_with java %bcond_with java
Summary: Subversion, a version control system. Summary: Subversion, a version control system.
Name: subversion Name: subversion
Version: 1.10.6 Version: 1.14.0
Release: 2 Release: 1
License: ASL 2.0 License: ASL 2.0
URL: https://subversion.apache.org/ URL: https://subversion.apache.org/
@ -46,16 +46,16 @@ Development package for subversion.
%package_help %package_help
Requires: subversion = %{version}-%{release} Requires: subversion = %{version}-%{release}
%package -n python2-%{name} %package -n python3-%{name}
%{?python_provide:%python_provide python2-subversion} %{?python_provide:%python_provide python3-subversion}
Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python = %{version}-%{release}
Provides: python2-%{name} = %{version}-%{release} Provides: python3-%{name} = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release}
BuildRequires: python2-devel BuildRequires: python3-devel py3c-devel
Summary: python2 bindings to the subversion libraries Summary: python3 bindings to the subversion libraries
%description -n python2-%{name} %description -n python3-%{name}
python2 bindings to the subversion libraries python3 bindings to the subversion libraries
%package -n perl-%{name} %package -n perl-%{name}
Summary: perl bindings to the subversion libraries Summary: perl bindings to the subversion libraries
@ -97,7 +97,9 @@ This package includes the Ruby bindings to the Subversion libraries.
%autosetup -n %{name}-%{version} -S git %autosetup -n %{name}-%{version} -S git
%build %build
mv build-outputs.mk build-outputs.mk.old
export PYTHON=%{svn_python} export PYTHON=%{svn_python}
touch build/generator/swig/*.py
PATH=/usr/bin:$PATH ./autogen.sh --release PATH=/usr/bin:$PATH ./autogen.sh --release
perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@ -237,9 +239,9 @@ make check-javahl
%postun devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig
%post -n python2-%{name} -p /sbin/ldconfig %post -n python3-%{name} -p /sbin/ldconfig
%postun -n python2-%{name} -p /sbin/ldconfig %postun -n python3-%{name} -p /sbin/ldconfig
%post -n perl-%{name} -p /sbin/ldconfig %post -n perl-%{name} -p /sbin/ldconfig
@ -274,9 +276,9 @@ make check-javahl
%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt %doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
%{_libdir}/httpd/modules/mod_*.so %{_libdir}/httpd/modules/mod_*.so
%files -n python2-subversion %files -n python3-subversion
%{python2_sitearch}/svn %{python3_sitearch}/svn
%{python2_sitearch}/libsvn %{python3_sitearch}/libsvn
%files devel %files devel
%{_includedir}/subversion-1 %{_includedir}/subversion-1
@ -308,6 +310,12 @@ make check-javahl
%endif %endif
%changelog %changelog
* Sat Aug 1 2020 yang_zhuang_zhuang<yangzhuangzhuang1@huawei.com> - 1.14.0-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update version to 1.14.0
* Wed Oct 30 2019 chengquan<chengquan3@huawei.com> - 1.10.6-2 * Wed Oct 30 2019 chengquan<chengquan3@huawei.com> - 1.10.6-2
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA