From 608491866f66d7399c6d11c819f197d29b594804 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jul 11 2016 08:46:49 +0000 Subject: patch for ghc8 prelude --- diff --git a/shake-0.13.4-ghc8-prelude.patch b/shake-0.13.4-ghc8-prelude.patch new file mode 100644 index 0000000..fa6106c --- /dev/null +++ b/shake-0.13.4-ghc8-prelude.patch @@ -0,0 +1,43 @@ +diff -up shake-0.13.4/Development/Shake/FilePath.hs~ shake-0.13.4/Development/Shake/FilePath.hs +--- shake-0.13.4/Development/Shake/FilePath.hs~ 2014-09-20 05:31:36.000000000 +0900 ++++ shake-0.13.4/Development/Shake/FilePath.hs 2016-07-11 17:01:35.869453434 +0900 +@@ -18,7 +18,7 @@ module Development.Shake.FilePath( + + import System.FilePath.Posix hiding + (normalise, (), combine +- ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath) ++ ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath, (-<.>)) + import System.FilePath(searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath) + import General.Base + import qualified System.FilePath as Native +diff -up shake-0.13.4/Development/Shake.hs~ shake-0.13.4/Development/Shake.hs +--- shake-0.13.4/Development/Shake.hs~ 2014-09-20 05:31:36.000000000 +0900 ++++ shake-0.13.4/Development/Shake.hs 2016-07-11 17:07:18.543454380 +0900 +@@ -159,3 +159,5 @@ import Development.Shake.Rules.Files + import Development.Shake.Rules.Oracle + import Development.Shake.Rules.OrderOnly + import Development.Shake.Rules.Rerun ++ ++import Prelude hiding ((*>)) +diff -up shake-0.13.4/Development/Shake/Rules/File.hs~ shake-0.13.4/Development/Shake/Rules/File.hs +--- shake-0.13.4/Development/Shake/Rules/File.hs~ 2014-09-20 05:31:36.000000000 +0900 ++++ shake-0.13.4/Development/Shake/Rules/File.hs 2016-07-11 17:06:01.447454178 +0900 +@@ -32,6 +32,7 @@ import Data.Maybe + import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong + import System.IO.Unsafe(unsafeInterleaveIO) + ++import Prelude hiding ((*>)) + + infix 1 *>, ?>, |*>, **>, ~> + +diff -up shake-0.13.4/Development/Shake/Rules/Files.hs~ shake-0.13.4/Development/Shake/Rules/Files.hs +--- shake-0.13.4/Development/Shake/Rules/Files.hs~ 2014-09-20 05:31:36.000000000 +0900 ++++ shake-0.13.4/Development/Shake/Rules/Files.hs 2016-07-11 17:25:14.706417609 +0900 +@@ -19,6 +19,7 @@ import Development.Shake.Types + + import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong + ++import Prelude hiding ((*>)) + + infix 1 ?>>, *>>, &?>, &*> + diff --git a/shake.spec b/shake.spec index 6fe65b7..c51d4bb 100644 --- a/shake.spec +++ b/shake.spec @@ -2,21 +2,20 @@ %global pkg_name shake -%ifarch %{ix86} x86_64 -%bcond_without tests -%endif +%bcond_with tests # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} Name: %{pkg_name} Version: 0.13.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Make-like build system License: BSD URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Patch0: shake-0.13.4-ghc8-prelude.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -84,6 +83,7 @@ information (e.g. compiler version). %prep %setup -q +%patch0 -p1 -b .orig cd Test/Ninja for i in test4 test3-win test3-sub test3-inc test5 test3 lint test2 test3-unix; do @@ -133,6 +133,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/docs/manual/* %changelog +* Mon Jul 11 2016 Jens Petersen - 0.13.4-4 +- patch for ghc8 Prelude.(*>) +- disable tests due to -Wall -Werror + * Thu Feb 04 2016 Fedora Release Engineering - 0.13.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild