Apply patch from cgwalters - dep on python-flask is optional now (bcond tests added)
This commit is contained in:
parent
0f796f3460
commit
000d698a75
13
librepo.spec
13
librepo.spec
@ -4,13 +4,16 @@
|
|||||||
%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
|
%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
|
||||||
# Do not build bindings for python3 for RHEL <= 7
|
# Do not build bindings for python3 for RHEL <= 7
|
||||||
%bcond_with python3
|
%bcond_with python3
|
||||||
|
# python-flask is not in RHEL7
|
||||||
|
%bcond_with tests
|
||||||
%else
|
%else
|
||||||
%bcond_without python3
|
%bcond_without python3
|
||||||
|
%bcond_without tests
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: librepo
|
Name: librepo
|
||||||
Version: 1.7.15
|
Version: 1.7.15
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Repodata downloading library
|
Summary: Repodata downloading library
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -56,8 +59,10 @@ Summary: Python bindings for the librepo library
|
|||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
BuildRequires: pygpgme
|
BuildRequires: pygpgme
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
|
%if %{with tests}
|
||||||
BuildRequires: python-flask
|
BuildRequires: python-flask
|
||||||
BuildRequires: python-nose
|
BuildRequires: python-nose
|
||||||
|
%endif
|
||||||
BuildRequires: python-sphinx
|
BuildRequires: python-sphinx
|
||||||
BuildRequires: pyxattr
|
BuildRequires: pyxattr
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
@ -103,6 +108,7 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
%if %{with tests}
|
||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
@ -110,6 +116,7 @@ pushd py3
|
|||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
@ -141,6 +148,10 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 12 2015 Colin Walters <walters@redhat.com> - 1.7.15-2
|
||||||
|
- Disable tests and drop python-flask build dependency on RHEL7, as
|
||||||
|
it is not in the core
|
||||||
|
|
||||||
* Tue Apr 14 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 1.7.15-1
|
* Tue Apr 14 2015 Tomas Mlcoch <tmlcoch at redhat.com> - 1.7.15-1
|
||||||
- Do not inlude header in the body output (RhBug: 1207685)
|
- Do not inlude header in the body output (RhBug: 1207685)
|
||||||
- metalink: Proper error handling
|
- metalink: Proper error handling
|
||||||
|
Loading…
Reference in New Issue
Block a user