!1 Update python-sphinx support to python3
Merge pull request !1 from chengquan/developer
This commit is contained in:
commit
c25711a0d1
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: libcomps
|
Name: libcomps
|
||||||
Version: 0.1.8
|
Version: 0.1.8
|
||||||
Release: 19
|
Release: 20
|
||||||
Summary: Comps XML file manipulation library
|
Summary: Comps XML file manipulation library
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/rpm-software-management/libcomps
|
URL: https://github.com/rpm-software-management/libcomps
|
||||||
@ -27,11 +27,7 @@ Development files for libcomps library.
|
|||||||
Summary: Documentation files for libcomps library
|
Summary: Documentation files for libcomps library
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with_python2}
|
|
||||||
BuildRequires: python2-sphinx
|
|
||||||
%else
|
|
||||||
BuildRequires: python3-sphinx
|
BuildRequires: python3-sphinx
|
||||||
%endif
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
|
|
||||||
%description help
|
%description help
|
||||||
@ -80,11 +76,7 @@ popd
|
|||||||
|
|
||||||
mkdir build-doc
|
mkdir build-doc
|
||||||
pushd build-doc
|
pushd build-doc
|
||||||
%if %{with_python2}
|
|
||||||
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=2
|
|
||||||
%else
|
|
||||||
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
|
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
|
||||||
%endif
|
|
||||||
make %{?_smp_mflags} docs
|
make %{?_smp_mflags} docs
|
||||||
make %{?_smp_mflags} pydocs
|
make %{?_smp_mflags} pydocs
|
||||||
popd
|
popd
|
||||||
@ -96,7 +88,6 @@ pushd build-py2
|
|||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with_python3}
|
%if %{with_python3}
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
%make_install
|
%make_install
|
||||||
@ -145,7 +136,13 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.1.8-18
|
* Thu Feb 20 2020 chengquan<chengquan3@huawei.com> - 0.1.8-20
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Update python-sphinx support to python3
|
||||||
|
|
||||||
|
* Wed Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.1.8-19
|
||||||
- del requires
|
- del requires
|
||||||
|
|
||||||
* Tue Sep 24 2019 shenyangyang<shenyangyang4@huawei.com> - 0.1.8-18
|
* Tue Sep 24 2019 shenyangyang<shenyangyang4@huawei.com> - 0.1.8-18
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user