#3 Subpackage python2-sphinx-intl has been removed
Merged a year ago by jujens. Opened a year ago by churchyard.
rpms/ churchyard/python-sphinx-intl nopy2  into  master

file modified
+8 -72

@@ -7,18 +7,10 @@ 

  to translate and to apply translation to Sphinx generated document. Optional: \

  support the Transifex service for translation with Sphinx (not packaged yet).

  

- # Match what is done in python-sphinx

- %global py2_alt_priority 100

- %if 0%{?fedora} > 24

- %global py3_alt_priority 500

- %else

- %global py3_alt_priority 10

- %endif

- 

  

  Name:           python-%{pypi_name}

  Version:        0.9.11

- Release:        5%{?dist}

+ Release:        6%{?dist}

  Summary:        Sphinx utility that make it easy to translate and to apply translation

  

  License:        BSD

@@ -37,28 +29,6 @@ 

  %desc

  

  

- %package -n python2-%{pypi_name}

- Summary:        %{summary}

- BuildRequires:  python2-devel

- BuildRequires:  python2-setuptools

- BuildRequires:  python2-pytest

- BuildRequires:  python2-six

- BuildRequires:  python2-click

- BuildRequires:  python2-babel

- BuildRequires:  python2-sphinx

- Requires(post): %{_sbindir}/update-alternatives

- Requires(postun): %{_sbindir}/update-alternatives

- Requires:       python2-setuptools

- Requires:       python2-six

- Requires:       python2-click

- Requires:       python2-babel

- Requires:       python2-sphinx

- %{?python_provide:%python_provide python2-%{pypi_name}}

- 

- %description -n python2-%{pypi_name}

- %desc

- 

- 

  %package -n     python%{python3_pkgversion}-%{pypi_name}

  Summary:        %{summary}

  BuildArch:      noarch

@@ -69,13 +39,12 @@ 

  BuildRequires:  python%{python3_pkgversion}-click

  BuildRequires:  python%{python3_pkgversion}-babel

  BuildRequires:  python%{python3_pkgversion}-sphinx

- Requires(post): %{_sbindir}/update-alternatives

- Requires(postun): %{_sbindir}/update-alternatives

  Requires:       python%{python3_pkgversion}-setuptools

  Requires:       python%{python3_pkgversion}-six

  Requires:       python%{python3_pkgversion}-click

  Requires:       python%{python3_pkgversion}-babel

  Requires:       python%{python3_pkgversion}-sphinx

+ Conflicts:      python2-%{pypi_name} < 0.9.11-6

  %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}

  

  %description -n python%{python3_pkgversion}-%{pypi_name}

@@ -89,72 +58,39 @@ 

  

  

  %build

- %py2_build

  %py3_build

  

  

  %install

- %py2_install

- pushd %{buildroot}%{_bindir}

- mv %{cmdname} %{cmdname}-%{python2_version}

- ln -s %{cmdname}-%{python2_version} %{cmdname}-2

- popd

- 

  %py3_install

  pushd %{buildroot}%{_bindir}

  mv %{cmdname} %{cmdname}-%{python3_version}

  ln -s %{cmdname}-%{python3_version} %{cmdname}-3

+ ln -s %{cmdname}-3 %{cmdname}

  popd

  

- touch %{buildroot}%{_bindir}/%{cmdname}

- 

  

  %check

  # Transifex is not packaged. Remove tests that depens on it.

  rm tests/test_*transifex*.py

- PYTHONPATH="$(pwd)" py.test-%{python2_version} -v .

  PYTHONPATH="$(pwd)" py.test-%{python3_version} -v .

  

  

- %post -n python2-%{pypi_name}

- update-alternatives --install %{_bindir}/%{cmdname} %{cmdname} %{_bindir}/%{cmdname}-%{python2_version} %{py2_alt_priority}

- 

- 

- %post -n python3-%{pypi_name}

- update-alternatives --install %{_bindir}/%{cmdname} %{cmdname} %{_bindir}/%{cmdname}-%{python3_version} %{py3_alt_priority}

- 

- 

- %postun -n python2-%{pypi_name}

- if [ $1 -eq 0 ] ; then

-   update-alternatives --remove %{cmdname} %{_bindir}/%{cmdname}-%{python2_version}

- fi

- 

- 

- %postun -n python3-%{pypi_name}

- if [ $1 -eq 0 ] ; then

-   update-alternatives --remove %{cmdname} %{_bindir}/%{cmdname}-%{python3_version}

- fi

- 

- 

- %files -n python2-%{pypi_name}

- %license LICENSE

- %doc README.rst

- %ghost %{_bindir}/%{cmdname}

- %{python2_sitelib}/%{srcname}-%{version}*-py%{python2_version}.egg-info/

- %{python2_sitelib}/%{srcname}/

- %{_bindir}/%{cmdname}-2*

- 

  

  %files -n python%{python3_pkgversion}-%{pypi_name}

  %license LICENSE

  %doc README.rst

- %ghost %{_bindir}/%{cmdname}

  %{python3_sitelib}/%{srcname}-%{version}*-py%{python3_version}.egg-info/

  %{python3_sitelib}/%{srcname}/

  %{_bindir}/%{cmdname}-3*

+ %{_bindir}/%{cmdname}

  

  

  %changelog

+ * Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.11-6

+ - Subpackage python2-sphinx-intl has been removed

+   See https://fedoraproject.org/wiki/Changes/Sphinx2

+ 

  * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.11-5

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

It looks good. Is this one ready to be merged? I'm asking because of the tow other PR that seem not to.

Yes. Current sphinx does not depend on this one.

We should check if upgrading to this version works good. I don't have much experience with the ghosted executable.

We should check if upgrading to this version works good. I don't have much experience with the ghosted executable.

Sadly, neither do I. I'll try to do tests by this week-end.

I'll do some tests in mock now.

From old python3-sphinx-intl to new python3-sphinx-intl: works great.

Running transaction
Preparing : 1/1
Upgrading : python3-sphinx-intl-0.9.11-6.fc31.noarch 1/2
Cleanup : python3-sphinx-intl-0.9.11-3.fc29.noarch 2/2
Running scriptlet: python3-sphinx-intl-0.9.11-3.fc29.noarch 2/2
Verifying : python3-sphinx-intl-0.9.11-6.fc31.noarch 1/2
Verifying : python3-sphinx-intl-0.9.11-3.fc29.noarch 2/2

Upgraded:
python3-sphinx-intl-0.9.11-6.fc31.noarch

From old python2-sphinx-intl with python3-sphinx-intl to new python3-sphinx-intl: expected failure.

Error:
Problem: problem with installed package python2-sphinx-intl-0.9.11-3.fc29.noarch
- package python3-sphinx-intl-0.9.11-6.fc31.noarch conflicts with python2-sphinx-intl < 0.9.11-6 provided by python2-sphinx-intl-0.9.11-3.fc29.noarch
- conflicting requests

fedora-obsolete-packages will obsolete python2-sphinx-intl < 0.9.11-4 to fix this.

With --allowerasing it works:

Running transaction
Preparing : 1/1
Upgrading : python3-sphinx-intl-0.9.11-6.fc31.noarch 1/3
Erasing : python2-sphinx-intl-0.9.11-3.fc29.noarch 2/3
Running scriptlet: python2-sphinx-intl-0.9.11-3.fc29.noarch 2/3
Cleanup : python3-sphinx-intl-0.9.11-3.fc29.noarch 3/3
Running scriptlet: python3-sphinx-intl-0.9.11-3.fc29.noarch 3/3
Verifying : python3-sphinx-intl-0.9.11-6.fc31.noarch 1/3
Verifying : python3-sphinx-intl-0.9.11-3.fc29.noarch 2/3
Verifying : python2-sphinx-intl-0.9.11-3.fc29.noarch 3/3

Upgraded:
python3-sphinx-intl-0.9.11-6.fc31.noarch

Removed:
python2-sphinx-intl-0.9.11-3.fc29.noarch

From old python2-sphinx-intl only to new python3-sphinx-intl: expected failure.

Error:
Problem: problem with installed package python2-sphinx-intl-0.9.11-3.fc29.noarch
- package python3-sphinx-intl-0.9.11-6.fc31.noarch conflicts with python2-sphinx-intl < 0.9.11-6 provided by python2-sphinx-intl-0.9.11-3.fc29.noarch
- conflicting requests

With --allowerasing it works:

Installed:
python3-sphinx-intl-0.9.11-6.fc31.noarch python3-babel-2.6.0-5.fc29.noarch python3-chardet-3.0.4-7.fc29.noarch python3-click-6.7-9.fc29.noarch
python3-docutils-0.14-5.fc29.noarch python3-funcsigs-1.0.2-11.fc29.noarch python3-idna-2.7-3.fc29.noarch python3-imagesize-1.0.0-3.fc29.noarch
python3-jinja2-2.10-6.fc29.noarch python3-markupsafe-1.0-1.fc29.x86_64 python3-mock-2.0.0-10.fc29.noarch python3-pbr-4.1.1-1.fc29.noarch
python3-pyparsing-2.2.0-3.fc29.noarch python3-pysocks-1.6.8-4.fc29.noarch python3-pytz-2018.5-1.fc29.noarch python3-snowballstemmer-1.2.1-7.fc29.noarch
python3-sphinx-1:1.7.6-1.fc29.noarch python3-sphinx-theme-alabaster-0.7.11-5.fc29.noarch python3-sphinxcontrib-websupport-1.0.1-10.20180316git.fc29.noarch python3-whoosh-2.7.4-12.fc29.noarch
python3-packaging-19.0-1.fc29.noarch python3-pygments-2.2.0-16.fc29.noarch python3-requests-2.20.0-1.fc29.noarch python3-sphinx_rtd_theme-0.4.2-1.fc29.noarch
python3-sqlalchemy-1.2.18-1.fc29.x86_64 python3-urllib3-1.24.1-2.fc29.noarch

Removed:
python2-sphinx-intl-0.9.11-3.fc29.noarch

(I'm satisfied with those results.)

Looks good to me as well. Merging.

Pull-Request has been merged by jujens

a year ago