| |
@@ -4,7 +4,7 @@
|
| |
|
| |
Name: python-%{pypi_name_dash}
|
| |
Version: 4.3.0
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
Summary: The base package for Jupyter projects
|
| |
|
| |
License: BSD
|
| |
@@ -53,6 +53,12 @@
|
| |
|
| |
Requires: python%{python3_pkgversion}-traitlets
|
| |
Requires: python%{python3_pkgversion}-setuptools
|
| |
+
|
| |
+ # executables moved from py2 to py3
|
| |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1410332
|
| |
+ # Can be removed in Fedora 30
|
| |
+ Conflicts: python2-%{pypi_name_dash} < 4.3.0-2
|
| |
+
|
| |
%description -n python%{python3_pkgversion}-%{pypi_name_dash}
|
| |
Core common functionality of Jupyter projects.
|
| |
|
| |
@@ -80,22 +86,12 @@
|
| |
|
| |
%install
|
| |
find | grep pyc$ | xargs rm -v
|
| |
- # Must do the subpackages' install first because the scripts in /usr/bin are
|
| |
- # overwritten with every setup.py install.
|
| |
- %py3_install
|
| |
- mv %{buildroot}/%{_bindir}/jupyter %{buildroot}/%{_bindir}/jupyter-%{python3_version}
|
| |
- ln -s jupyter-%{python3_version} %{buildroot}/%{_bindir}/jupyter-3
|
| |
- mv %{buildroot}/%{_bindir}/jupyter-migrate %{buildroot}/%{_bindir}/jupyter-migrate-%{python3_version}
|
| |
- ln -s jupyter-migrate-%{python3_version} %{buildroot}/%{_bindir}/jupyter-migrate-3
|
| |
|
| |
%py2_install
|
| |
- mv %{buildroot}/%{_bindir}/jupyter %{buildroot}/%{_bindir}/jupyter-%{python2_version}
|
| |
- ln -s jupyter-%{python2_version} %{buildroot}/%{_bindir}/jupyter-2
|
| |
- mv %{buildroot}/%{_bindir}/jupyter-migrate %{buildroot}/%{_bindir}/jupyter-migrate-%{python2_version}
|
| |
- ln -s jupyter-migrate-%{python2_version} %{buildroot}/%{_bindir}/jupyter-migrate-2
|
| |
+ rm %{buildroot}%{_bindir}/*
|
| |
+
|
| |
+ %py3_install
|
| |
|
| |
- ln -s jupyter-2 %{buildroot}/%{_bindir}/jupyter
|
| |
- ln -s jupyter-migrate-2 %{buildroot}/%{_bindir}/jupyter-migrate
|
| |
|
| |
# Remove shebang from troubleshoot.py
|
| |
for lib in %{buildroot}{%{python2_sitelib},%{python3_sitelib}}/jupyter_core/troubleshoot.py; do
|
| |
@@ -109,13 +105,6 @@
|
| |
%files -n python2-%{pypi_name_dash}
|
| |
%license COPYING.md
|
| |
%doc README.md
|
| |
- %{_bindir}/jupyter
|
| |
- %{_bindir}/jupyter-2
|
| |
- %{_bindir}/jupyter-%{python2_version}
|
| |
- %{_bindir}/jupyter-migrate
|
| |
- %{_bindir}/jupyter-migrate-2
|
| |
- %{_bindir}/jupyter-migrate-%{python2_version}
|
| |
-
|
| |
%{python2_sitelib}/jupyter.py*
|
| |
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
%{python2_sitelib}/%{pypi_name}/
|
| |
@@ -123,10 +112,9 @@
|
| |
%files -n python%{python3_pkgversion}-%{pypi_name_dash}
|
| |
%license COPYING.md
|
| |
%doc README.md
|
| |
- %{_bindir}/jupyter-3
|
| |
- %{_bindir}/jupyter-%{python3_version}
|
| |
- %{_bindir}/jupyter-migrate-3
|
| |
- %{_bindir}/jupyter-migrate-%{python3_version}
|
| |
+ %{_bindir}/jupyter
|
| |
+ %{_bindir}/jupyter-migrate
|
| |
+
|
| |
%{python3_sitelib}/__pycache__/*
|
| |
%{python3_sitelib}/jupyter.py
|
| |
%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
| |
@@ -136,6 +124,9 @@
|
| |
%doc html
|
| |
|
| |
%changelog
|
| |
+ * Fri Sep 01 2017 Miro Hrončok <mhroncok@redhat.com> - 4.3.0-2
|
| |
+ - Move executables from py2 to py3 (#1410332)
|
| |
+
|
| |
* Tue Aug 29 2017 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-1
|
| |
- Update to 4.3.0
|
| |
|
| |
churchyard
commented 6 years ago
Koji scratchbuild https://koji.fedoraproject.org/koji/taskinfo?taskID=21604882