diff --git a/ghc.spec b/ghc.spec index 22d6b1e..b78e571 100644 --- a/ghc.spec +++ b/ghc.spec @@ -44,7 +44,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: 111%{?dist} +Release: 112%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -549,9 +549,12 @@ install -p -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/ghc-pkg.1 install -p -m 0644 %{SOURCE6} %{buildroot}%{_mandir}/man1/haddock.1 install -p -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man1/runghc.1 -# fix llvm paths %ifarch %{ghc_llvm_archs} +# fix llvm paths sed -i -e "s!$PWD/llvm-%{llvm_version}.src/_build!%{ghclibdir}/llvm!" %{buildroot}%{ghclibdir}/settings + +# Remove opt-viewer, since this is just a compatibility package. +rm -r %{buildroot}%{ghclibdir}/llvm/share/opt-viewer %endif @@ -735,6 +738,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %changelog +* Sat Jun 19 2021 Jens Petersen - 8.8.4-112 +- remove llvm opt-viewer since it uses python2.7 + * Wed Jun 16 2021 Jens Petersen - 8.8.4-111 - bundle llvm7.0 on aarch64 (#1918080)