Remove the rightmost version number from the path

This commit is contained in:
Michal Cyprian 2018-04-11 01:31:31 +02:00 committed by Miro Hrončok
parent c54059a679
commit cf5da9288b
1 changed files with 11 additions and 6 deletions

View File

@ -1,7 +1,8 @@
%global basever 5.10
Name: pypy3
Version: 5.10.1
Version: %{basever}.1
%global pyversion 3.5
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Python 3 implementation with a Just-In-Time compiler
# LGPL and another free license we'd need to ask spot about are present in some
@ -119,7 +120,7 @@ ExcludeArch: aarch64
# Easy way to turn off the selftests:
%global run_selftests 1
%global pypyprefix %{_libdir}/pypy3-%{version}
%global pypyprefix %{_libdir}/pypy3-%{basever}
%global pylibver 3
# We refer to this subdir of the source tree in a few places during the build:
@ -464,8 +465,8 @@ mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{pypyprefix}
# Run installing script, archive-name %{name}-%{version} in %{buildroot}/%{_libdir} == %{pypyprefix}
%{bootstrap_python_interp} pypy/tool/release/package.py --archive-name %{name}-%{version} --builddir %{buildroot}/%{_libdir}
# Run installing script, archive-name %{name}-%{basever} in %{buildroot}/%{_libdir} == %{pypyprefix}
%{bootstrap_python_interp} pypy/tool/release/package.py --archive-name %{name}-%{basever} --builddir %{buildroot}/%{_libdir}
# Remove shebang lines from .py files that aren't executable, and
@ -639,7 +640,7 @@ cp -a rpython/jit/tool/pypytrace-mode.elc %{buildroot}/%{_emacs_sitelispdir}/pyp
install -m0644 -p -D -t %{buildroot}/%{_rpmconfigdir}/macros.d %{SOURCE2}
# Remove files we don't want:
rm -f %{buildroot}%{_libdir}/pypy3-5.2.0.tar.bz2 \
rm -f %{buildroot}%{_libdir}/%{name}-%{basever}.tar.bz2 \
%{buildroot}%{pypyprefix}/LICENSE \
%{buildroot}%{pypyprefix}/README.rst
@ -821,6 +822,10 @@ CheckPyPy %{name}-stackless
%changelog
* Tue Apr 10 2018 Michal Cyprian <mcyprian@redhat.com> - 5.10.1-5
- Remove the rightmost version number from the path
- rhbz#1516885: https://bugzilla.redhat.com/show_bug.cgi?id=1516885
* Thu Mar 29 2018 Michal Cyprian <mcyprian@redhat.com> - 5.10.1-4
- Add patch for libxcrypt