PR#2: Remove the rightmost version number from the path - rpms/pypy3

rpms / pypy3

#2 Remove the rightmost version number from the path

Merged 6 years ago by churchyard. Opened 6 years ago by churchyard.

rpms/ churchyard/pypy3 remove_patch_from_path into master

Remove the rightmost version number from the path

Michal Cyprian • 6 years ago

cf5da92

pypy3.spec

file modified

+11 -6

		`@@ -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 @@`
		`# 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}/%{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 @@`
		`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 @@`


		`%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`