Remove environment-modules as well because aviso doesn't want major changes
like introducing alternatives or environment-modules to hit the released Fedora. This takes the package back to before the alternatives changes were erroneously pushed back into f24.
This commit is contained in:
Toshio Kuratomi
parent
0a685e9dcd
commit
b147b17809
1 changed files with 18 additions and 55 deletions
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
Name: python-sphinx
|
||||
Version: 1.4.8
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Python documentation generator
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -27,10 +27,6 @@ Group: Development/Tools
|
|||
License: BSD and Public Domain and Python and (MIT or GPLv2)
|
||||
URL: http://sphinx-doc.org/
|
||||
Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
|
||||
Source1: python2-sphinx
|
||||
Source2: python3-sphinx
|
||||
Source3: zz-modules-python-sphinx.sh
|
||||
Source4: zz-modules-python-sphinx.csh
|
||||
Patch0: Sphinx-1.2.1-mantarget.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
|
@ -44,7 +40,6 @@ BuildRequires: python-six
|
|||
BuildRequires: python2-sphinx_rtd_theme
|
||||
BuildRequires: python2-sphinx-theme-alabaster
|
||||
BuildRequires: python2-imagesize
|
||||
BuildRequires: environment(modules)
|
||||
|
||||
# for fixes
|
||||
BuildRequires: dos2unix
|
||||
|
|
@ -151,9 +146,8 @@ Requires: python2-sphinx_rtd_theme
|
|||
Requires: python2-six
|
||||
Requires: python2-sphinx-theme-alabaster
|
||||
Requires: python2-imagesize
|
||||
Requires(posttrans): Lmod
|
||||
# Needed to get rid of the alternatives config installed in f24 and f25
|
||||
# versions of the package
|
||||
# Needed to get rid of the alternatives config installed in
|
||||
# an earlier version of f24
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Recommends: graphviz
|
||||
Obsoletes: python-sphinx <= 1.2.3
|
||||
|
|
@ -256,9 +250,8 @@ Requires: python3-sphinx-theme-alabaster
|
|||
Requires: python3-imagesize
|
||||
Requires: python3-six
|
||||
Recommends: graphviz
|
||||
Requires(posttrans): Lmod
|
||||
# Needed to get rid of the alternatives config installed in f24 and f25
|
||||
# versions of the package
|
||||
# Needed to get rid of the alternatives config installed in
|
||||
# an earlier version of f24
|
||||
Requires(posttrans): /usr/sbin/alternatives
|
||||
Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0
|
||||
Provides: python3-sphinxcontrib-napoleon = %{version}-%{release}
|
||||
|
|
@ -360,20 +353,16 @@ popd
|
|||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
install -d %{buildroot}%{_libexecdir}/python3-sphinx
|
||||
for i in sphinx-{apidoc,autogen,build,quickstart}; do
|
||||
mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
|
||||
ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
|
||||
ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
|
||||
done
|
||||
%endif # with_python3
|
||||
|
||||
%py2_install
|
||||
install -d %{buildroot}%{_libexecdir}/python2-sphinx
|
||||
for i in sphinx-{apidoc,autogen,build,quickstart}; do
|
||||
mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version}
|
||||
ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2
|
||||
ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
|
||||
done
|
||||
|
||||
pushd doc
|
||||
|
|
@ -414,33 +403,14 @@ do
|
|||
done
|
||||
popd
|
||||
|
||||
install -d %{buildroot}%{_modulesdir}/python-sphinx
|
||||
install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
|
||||
sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
|
||||
install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
|
||||
sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
|
||||
install -d %{buildroot}%{_sysconfdir}/profile.d
|
||||
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
|
||||
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
|
||||
|
||||
%if %{py3_default}
|
||||
ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
|
||||
|
||||
# These symlinks establish a default for when a package is first installed (and
|
||||
# therefore, environment modules is not loaded). The user can immediately
|
||||
# switch them by using module swap python-sphinx/python2-sphinx
|
||||
for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
|
||||
ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
|
||||
ln -s %{_bindir}/$filename-3 %{buildroot}%{_bindir}/$filename
|
||||
done
|
||||
|
||||
%else
|
||||
ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
|
||||
|
||||
# These symlinks establish a default for when a package is first installed (and
|
||||
# therefore, environment modules is not loaded). The user can immediately
|
||||
# switch them by using module swap python-sphinx/python3-sphinx
|
||||
for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
|
||||
ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
|
||||
ln -s %{_bindir}/$filename-2 %{buildroot}%{_bindir}/$filename
|
||||
done
|
||||
|
||||
%endif
|
||||
|
|
@ -493,13 +463,11 @@ popd
|
|||
%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
|
||||
%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
|
||||
%{_mandir}/man1/*
|
||||
%{_libexecdir}/python2-sphinx/
|
||||
%{_modulesdir}/python-sphinx/python2-sphinx
|
||||
%if !%{py3_default}
|
||||
%{_modulesdir}/python-sphinx/default
|
||||
%endif
|
||||
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
|
||||
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
|
||||
%{_bindir}/sphinx-apidoc
|
||||
%{_bindir}/sphinx-autogen
|
||||
%{_bindir}/sphinx-build
|
||||
%{_bindir}/sphinx-quickstart
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
|
||||
|
|
@ -507,20 +475,9 @@ popd
|
|||
%license LICENSE
|
||||
%doc AUTHORS CHANGES EXAMPLES README.rst
|
||||
%{_bindir}/sphinx-*-3*
|
||||
%{_bindir}/sphinx-build
|
||||
%{_bindir}/sphinx-apidoc
|
||||
%{_bindir}/sphinx-autogen
|
||||
%{_bindir}/sphinx-quickstart
|
||||
%{python3_sitelib}/sphinx/
|
||||
%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
|
||||
%{_mandir}/man1/sphinx-*-%{python3_version}.1*
|
||||
%{_libexecdir}/python3-sphinx/
|
||||
%{_modulesdir}/python-sphinx/python3-sphinx
|
||||
%if %{py3_default}
|
||||
%{_modulesdir}/python-sphinx/default
|
||||
%endif
|
||||
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
|
||||
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
|
||||
|
||||
%endif # with_python3
|
||||
|
||||
|
|
@ -529,6 +486,12 @@ popd
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.8-3
|
||||
- Remove environment-modules as well because aviso doesn't want major changes
|
||||
like introducing alternatives or environment-modules to hit the released
|
||||
Fedora. This takes the package back to before the alternatives changes
|
||||
were erroneously pushed back into f24.
|
||||
|
||||
* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.8-2
|
||||
- Remove alternatives. Alternatives should only be used for a very small
|
||||
number of packages (system daemons which also have a compatible command line
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue