Solving problems with build

This commit is contained in:
Miro Hrončok 2014-06-27 23:12:58 +02:00
parent f22eb7c48a
commit d335e8943f
2 changed files with 9 additions and 5 deletions

View File

@ -11,12 +11,12 @@
# these macros won't be needed if doing non-scl build, so define them in a way that won't overwrite system ones
%@scl@_os_install_post \
/usr/lib/rpm/brp-scl-compress %{_scl_root} \
%{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip} \
/usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
%{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip} \
/usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
} \
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
/usr/lib/rpm/brp-strip-static-archive %{__strip} \
%{!?_turn_off_bytecompile:scl enable @scl@ '/usr/lib/rpm/redhat/brp-python-bytecompile-with-scl-python-35 %@scl@__python3 %{?_python_bytecompile_errors_terminate_build} %{_scl_root}'} \
/usr/lib/rpm/redhat/brp-python-hardlink
/usr/lib/rpm/brp-python-hardlink
%@scl@_python_provides /usr/lib/rpm/pythondeps-scl-35.sh --provides %{?scl:@scl@-}
%@scl@_python_requires /usr/lib/rpm/pythondeps-scl-35.sh --requires %{?scl:@scl@-}

View File

@ -137,7 +137,8 @@ Release: 0.3.20140626hg3151f6f9df85%{?dist}
License: Python
Group: Development/Languages
%global __provides_exclude ^pkgconfig
%{?scl:%global __provides_exclude ^pkgconfig}
%{?scl:%global __requires_exclude ^python\\(abi}
# =======================
# Build-time requirements
@ -728,6 +729,9 @@ URL: http://www.python.org/
# See notes in bug 532118:
Provides: %{?scl_prefix}python(abi) = %{pybasever}
# This should not be here! It's an ugly workaround for prov/req filtering
Provides: python(abi) = %{pybasever}
Requires: %{?scl_prefix}%{pkg_name}-libs%{?_isa} = %{version}-%{release}
%{?scl:Requires: %{scl}-runtime}