rpms/eccodes
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable excludearch statements again, and remove Provides for grib_api

Browse Source
This commit is contained in:
Jos de Kloe 2019-10-27 13:37:33 +01:00
parent 1b5923d046
commit 78995fe03f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eccodes.spec
View File

@ -86,20 +86,21 @@ Requires: %{name}-data = %{version}-%{release}
# So the old grib_api will need to be obsoleted. # So the old grib_api will need to be obsoleted.
%if 0%{obsolete_grib_api} %if 0%{obsolete_grib_api}
Provides: grib_api = %{final_grib_api_version} # as stated in the note above, setting provides seems not correct here
# Provides: grib_api = %{final_grib_api_version}
Obsoletes: grib_api < %{final_grib_api_version} Obsoletes: grib_api < %{final_grib_api_version}
%endif %endif
# as explained in bugzilla #1562066 # as explained in bugzilla #1562066
#ExcludeArch: i686 ExcludeArch: i686
# as explained in bugzilla #1562071 # as explained in bugzilla #1562071
# note: this is no longer part of fc30/rawhide # note: this is no longer part of fc30/rawhide
# but the exclude is still needed for EPEL-7 # but the exclude is still needed for EPEL-7
#ExcludeArch: ppc64 #ExcludeArch: ppc64
# as explained in bugzilla #1562076 # as explained in bugzilla #1562076
#ExcludeArch: s390x ExcludeArch: s390x
# as explained in bugzilla #1562084 # as explained in bugzilla #1562084
#ExcludeArch: armv7hl ExcludeArch: armv7hl
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
# as explained in bugzilla #1629377 # as explained in bugzilla #1629377
@ -147,7 +148,7 @@ Requires: gcc-gfortran%{?_isa}
Requires: jasper-devel%{?_isa} Requires: jasper-devel%{?_isa}
%if 0%{obsolete_grib_api} %if 0%{obsolete_grib_api}
Provides: grib_api-devel = %{final_grib_api_version} # Provides: grib_api-devel = %{final_grib_api_version}
Obsoletes: grib_api-devel < %{final_grib_api_version} Obsoletes: grib_api-devel < %{final_grib_api_version}
%endif %endif