diff --git a/ghc.spec b/ghc.spec index af89833..ca0ac89 100644 --- a/ghc.spec +++ b/ghc.spec @@ -29,7 +29,7 @@ Version: 7.6.3 # - 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: 15%{?dist} +Release: 16%{?dist} Summary: Glasgow Haskell Compiler License: %BSDHaskellReport @@ -52,8 +52,6 @@ Patch10: ghc-wrapper-libffi-include.patch Patch12: ghc-7.4.2-Cabal-disable-ghci-libs.patch # fix compilation with llvm-3.3 Patch13: ghc-llvmCodeGen-empty-array.patch -# disable executable stack -Patch14: ghc-NCG-no-execstack.patch # fedora ghc has been bootstrapped on # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x @@ -226,8 +224,8 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build %endif %patch12 -p1 -b .orig + %patch13 -p1 -b .orig -%patch14 -p1 -b .orig %build @@ -441,6 +439,10 @@ fi %changelog +* Thu Jul 11 2013 Jens Petersen - 7.6.3-16 +- revert the executable stack patch since it didn't fully fix the problem + and yet changed the ghc library hash + * Wed Jul 10 2013 Jens Petersen - 7.6.3-15 - turn off executable stack flag in executables (#973512) (thanks Edward Zhang for upstream patch and Dhiru Kholia for report)