#8 Keep the LICENSE file in lib/pythonX.Y dir
Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.
rpms/ churchyard/pypy license  into  master

file modified
+2 -5
@@ -616,7 +616,6 @@ 

  # Move files to the right places and remove unnecessary files

  mv %{buildroot}/%{pypyprefix}/bin/libpypy-c.so %{buildroot}/%{_libdir}

  rm -rf %{buildroot}/%{_libdir}/%{name}-%{basever}.tar.bz2

- rm -rf %{buildroot}/%{pypyprefix}/LICENSE

  rm -rf %{buildroot}/%{pypyprefix}/README.rst

  rm -rf %{buildroot}/%{pypyprefix}/README.rst

  rm -rf %{buildroot}/%{pypy_include_dir}/README
@@ -763,16 +762,16 @@ 

  %endif # run_selftests

  

  # Because there's a bunch of binary subpackages and creating

- # /usr/share/licenses/pypy3-this and /usr/share/licenses/pypy3-that

+ # /usr/share/doc/pypy3-this and /usr/share/doc/pypy3-that

  # is just confusing for the user.

  %global _docdir_fmt %{name}

  

  %files libs

- %license LICENSE

  %doc README.rst

  

  %dir %{pypyprefix}

  %dir %{pypyprefix}/lib-python

+ %license %{pypyprefix}/LICENSE

  %{_libdir}/libpypy-c.so

  %{pypyprefix}/lib-python/%{pylibver}/

  %{pypyprefix}/lib_pypy/
@@ -783,7 +782,6 @@ 

  %endif

  

  %files

- %license LICENSE

  %doc README.rst

  %{_bindir}/%{name}

  %{_bindir}/%{name}%{pylibver}
@@ -799,7 +797,6 @@ 

  

  %if 0%{with_stackless}

  %files stackless

- %license LICENSE

  %doc README.rst

  %{_bindir}/%{name}-stackless

  %endif

Virtualenv tries to copy it.

See https://github.com/pypa/virtualenv/issues/1352

Virtualenv ~16.6 warns:

No LICENSE.txt / LICENSE found in source

Technically, it is probably possible to install the package without
%license files, but that would simply resort to the previous noncritical
behavior.

This fix is not critical and hence it doesn't bump release, for easier
backporting to all our Python packages.

rebased onto f841cbf

4 years ago

Pull-Request has been merged by churchyard

4 years ago