modify spec for requires

This commit is contained in:
linwei9 2020-08-04 15:32:06 +08:00
parent df062d63ba
commit 05cf7fe96a

View File

@ -1,4 +1,3 @@
%bcond_with python2_bindings
%bcond_without perl_bindings %bcond_without perl_bindings
%bcond_without ruby_bindings %bcond_without ruby_bindings
%bcond_without python3_bindings %bcond_without python3_bindings
@ -15,7 +14,7 @@
Name: libsolv Name: libsolv
Version: 0.7.14 Version: 0.7.14
Release: 1 Release: 2
Summary: Package dependency solver Summary: Package dependency solver
License: BSD License: BSD
URL: https://github.com/openSUSE/libsolv URL: https://github.com/openSUSE/libsolv
@ -27,7 +26,7 @@ Provides: libsolv-tools libsolv-demo
Obsoletes: libsolv-tools < %{version}-%{release} Obsoletes: libsolv-tools < %{version}-%{release}
Obsoletes: libsolv-demo < %{version}-%{release} Obsoletes: libsolv-demo < %{version}-%{release}
Requires: rpm >= 4.16.0 Requires: rpm
%description %description
A free package dependency solver using a satisfiability algorithm. The A free package dependency solver using a satisfiability algorithm. The
@ -104,17 +103,9 @@ Python 3 version.
%{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \ %{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \
%{?with_perl_bindings:-DENABLE_PERL=ON} \ %{?with_perl_bindings:-DENABLE_PERL=ON} \
%{?with_ruby_bindings:-DENABLE_RUBY=ON} \ %{?with_ruby_bindings:-DENABLE_RUBY=ON} \
%if %{with python2_bindings} || %{with python3_bindings}
-DENABLE_PYTHON=ON \
%if %{with python2_bindings}
-DPYTHON_EXECUTABLE=%{__python2} \
%if %{with python3_bindings} %if %{with python3_bindings}
-DENABLE_PYTHON3=ON \ -DENABLE_PYTHON3=ON \
-DPYTHON3_EXECUTABLE=%{__python3} \
%endif
%else
-DPYTHON_EXECUTABLE=%{__python3} \ -DPYTHON_EXECUTABLE=%{__python3} \
%endif
%endif %endif
%{nil} %{nil}
%ninja_build -C "%{_vpath_builddir}" %ninja_build -C "%{_vpath_builddir}"
@ -157,12 +148,6 @@ Python 3 version.
%files -n ruby-solv %files -n ruby-solv
%{ruby_vendorarchdir}/solv.so %{ruby_vendorarchdir}/solv.so
%if %{with python2_bindings}
%files -n python2-solv
%{python2_sitearch}/_solv.so
%{python2_sitearch}/solv.py*
%endif
%files -n python3-solv %files -n python3-solv
%{python3_sitearch}/_solv.so %{python3_sitearch}/_solv.so
%{python3_sitearch}/solv.py %{python3_sitearch}/solv.py
@ -174,6 +159,9 @@ Python 3 version.
%{_mandir}/man3/%{name}*.3* %{_mandir}/man3/%{name}*.3*
%changelog %changelog
* Tue Aug 4 2020 linwei<linwei54@huawei.com> - 0.7.14-2
- modify spec for requires
* Wed Jul 29 2020 linwei<linwei54@huawei.com> - 0.7.14-1 * Wed Jul 29 2020 linwei<linwei54@huawei.com> - 0.7.14-1
- Update libsolv to 0.7.14 - Update libsolv to 0.7.14