Compare commits

...

3 Commits

Author SHA1 Message Date
Troy Dawson 5eeb12394c Bump release 2020-09-09 15:20:40 +00:00
Troy Dawson 5caca1ad23 Remove all un-needed %if
Remove all %if's that deal with old fedora releases.
2020-08-18 15:12:05 +00:00
Troy Dawson 7ab1af8634 Remove un-needed %if
This %if statement is no longer needed because it addresses unsupported Fedora releases.
This also causes ELN builds to not be the same as Fedora Rawhide builds.

Signed-off-by: Troy Dawson <tdawson@redhat.com>
2020-08-12 20:01:37 +00:00
1 changed files with 4 additions and 14 deletions

View File

@ -49,7 +49,7 @@ Version: 8.8.4
# - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically
Release: 107%{?dist}
Release: 108%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@ -125,11 +125,7 @@ BuildRequires: python3
BuildRequires: python3-sphinx
%endif
%ifarch %{ghc_llvm_archs}
%if 0%{?fedora} > 29
BuildRequires: llvm%{llvm_major}
%else
BuildRequires: llvm >= %{llvm_major}
%endif
%endif
%if %{with dwarf}
BuildRequires: elfutils-devel
@ -189,11 +185,7 @@ Requires: ghc-base-devel%{?_isa} = %{base_ver}-%{release}
Obsoletes: ghc-doc-index < %{version}-%{release}
%endif
%ifarch %{ghc_llvm_archs}
%if 0%{?fedora} >= 29
Requires: llvm%{llvm_major}
%else
Requires: llvm >= %{llvm_major}
%endif
%endif
%description compiler
@ -391,12 +383,7 @@ EOF
autoreconf
%endif
%if 0%{?fedora} > 28
%ghc_set_gcc_flags
%else
export CFLAGS="${CFLAGS:-%optflags}"
export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"
%endif
# for ghc >= 8.2
export CC=%{_bindir}/gcc
@ -670,6 +657,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
* Tue Aug 18 2020 Troy Dawson <tdawson@redhat.com> - 8.8.4-108
- Cleanup old %if statements
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.8.4-107
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild