#4 Remove un-needed %if
Merged 3 years ago by tdawson. Opened 3 years ago by tdawson.
rpms/ tdawson/ghc master  into  master

file modified
+4 -14
@@ -49,7 +49,7 @@ 

  # - 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-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 @@ 

  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 @@ 

  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 @@ 

  

  

  %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

  

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

1 new commit added

  • Remove all un-needed %if
3 years ago

These %if statements that deal with unsupported versions of fedora, are causing build problems on ELN. ghc builds, but many of the ghc library builds fail.

If these %if statements are needed because this spec file is needed for EPEL, or other builds, then I could update them to something like "%if 0%{?fedora} || 0%{?rhel} >= 9"

1 new commit added

  • Bump release
3 years ago

Pull-Request has been merged by tdawson

3 years ago