[numpy/f19] Ship doc module (bug #1034357)

Orion Poplawski orion at fedoraproject.org
Thu Nov 28 05:52:01 UTC 2013


commit 0bc38cec86cd83f28498ebc5a141f3af545cdbdb
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Nov 25 22:43:18 2013 -0700

    Ship doc module (bug #1034357)

 numpy.spec |   30 +++++-------------------------
 1 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/numpy.spec b/numpy.spec
index dec3b5b..c5c22f2 100644
--- a/numpy.spec
+++ b/numpy.spec
@@ -120,20 +120,10 @@ env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
     %{__python3} setup.py install --root %{buildroot}
 rm -rf docs-f2py ; mv %{buildroot}%{python3_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f %{buildroot}%{python3_sitearch}/%{name}/f2py/f2py.1 f2py.1
-rm -rf doc ; mv -f %{buildroot}%{python3_sitearch}/%{name}/doc .
 install -D -p -m 0644 f2py.1 %{buildroot}%{_mandir}/man1/f2py.1
 pushd %{buildroot}%{_bindir} &> /dev/null
 popd &> /dev/null
 
-# Remove doc files. They should in in %%doc
-rm -f %{buildroot}%{python3_sitearch}/%{name}/COMPATIBILITY
-rm -f %{buildroot}%{python3_sitearch}/%{name}/DEV_README.txt
-rm -f %{buildroot}%{python3_sitearch}/%{name}/INSTALL.txt
-rm -f %{buildroot}%{python3_sitearch}/%{name}/LICENSE.txt
-rm -f %{buildroot}%{python3_sitearch}/%{name}/README.txt
-rm -f %{buildroot}%{python3_sitearch}/%{name}/THANKS.txt
-rm -f %{buildroot}%{python3_sitearch}/%{name}/site.cfg.example
-
 popd
 %endif # with_python3
 
@@ -144,7 +134,6 @@ env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
     %{__python} setup.py install --root %{buildroot}
 rm -rf docs-f2py ; mv %{buildroot}%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f %{buildroot}%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
-rm -rf doc ; mv -f %{buildroot}%{python_sitearch}/%{name}/doc .
 install -D -p -m 0644 f2py.1 %{buildroot}%{_mandir}/man1/f2py.1
 pushd %{buildroot}%{_bindir} &> /dev/null
 # symlink for anyone who was using f2py.numpy
@@ -155,20 +144,8 @@ popd &> /dev/null
 mkdir -p %{buildroot}/usr/include
 ln -s %{python_sitearch}/%{name}/core/include/numpy/ %{buildroot}/usr/include/numpy
 
-# Remove doc files. They should in in %%doc
-rm -f %{buildroot}%{python_sitearch}/%{name}/COMPATIBILITY
-rm -f %{buildroot}%{python_sitearch}/%{name}/DEV_README.txt
-rm -f %{buildroot}%{python_sitearch}/%{name}/INSTALL.txt
-rm -f %{buildroot}%{python_sitearch}/%{name}/LICENSE.txt
-rm -f %{buildroot}%{python_sitearch}/%{name}/README.txt
-rm -f %{buildroot}%{python_sitearch}/%{name}/THANKS.txt
-rm -f %{buildroot}%{python_sitearch}/%{name}/site.cfg.example
 
 %check
-# doc/io.py conflicts with the regular io module causing
-# AttributeError: 'module' object has no attribute 'BufferedIOBase' in tests
-rm doc/io.py*
-
 pushd doc &> /dev/null
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test()" \
 %ifarch s390 s390x
@@ -191,11 +168,12 @@ popd &> /dev/null
 
 
 %files
-%doc doc/* LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
+%doc doc/cython LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
 %dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/*.py*
 %{python_sitearch}/%{name}/core
 %{python_sitearch}/%{name}/distutils
+%{python_sitearch}/%{name}/doc
 %{python_sitearch}/%{name}/fft
 %{python_sitearch}/%{name}/lib
 %{python_sitearch}/%{name}/linalg
@@ -220,12 +198,13 @@ popd &> /dev/null
 
 %if 0%{?with_python3}
 %files -n python3-numpy
-%doc doc/* LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
+%doc doc/cython LICENSE.txt README.txt THANKS.txt DEV_README.txt COMPATIBILITY site.cfg.example
 %{python3_sitearch}/%{name}/__pycache__/*
 %dir %{python3_sitearch}/%{name}
 %{python3_sitearch}/%{name}/*.py*
 %{python3_sitearch}/%{name}/core
 %{python3_sitearch}/%{name}/distutils
+%{python3_sitearch}/%{name}/doc
 %{python3_sitearch}/%{name}/fft
 %{python3_sitearch}/%{name}/lib
 %{python3_sitearch}/%{name}/linalg
@@ -249,6 +228,7 @@ popd &> /dev/null
 
 %changelog
 * Wed Nov 27 2013 Orion Poplawski <orion at nwra.com> - 1:1.7.1-7
+- Ship doc module (bug #1034357)
 - Move f2py documentation to f2py package (bug #1027394)
 
 * Mon Oct 14 2013 Tomas Tomecek <ttomecek at redhat.com> - 1:1.7.1-6


More information about the scm-commits mailing list