[ghc-editline] GHC.Handle is now GHC.IO.Handle

Jens Petersen petersen at fedoraproject.org
Wed May 14 08:02:26 UTC 2014


commit 3a1080ac78af76be205b4b381ed17ef5a74ba5f3
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed May 14 17:02:14 2014 +0900

    GHC.Handle is now GHC.IO.Handle

 editline-0.2.1.1-ghc78-Handle.patch |   11 +++++++++++
 ghc-editline.spec                   |    6 +++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/editline-0.2.1.1-ghc78-Handle.patch b/editline-0.2.1.1-ghc78-Handle.patch
new file mode 100644
index 0000000..103f895
--- /dev/null
+++ b/editline-0.2.1.1-ghc78-Handle.patch
@@ -0,0 +1,11 @@
+--- editline-0.2.1.1/System/Console/Editline/Readline.hsc~	2012-11-26 17:33:51.000000000 +0900
++++ editline-0.2.1.1/System/Console/Editline/Readline.hsc	2014-05-14 16:57:43.222573491 +0900
+@@ -173,7 +173,7 @@
+ import Foreign.C.Types	( CInt(..), CChar, CFile )
+ import Foreign.C.String	( newCString, peekCString, withCString,
+ 			  castCharToCChar, castCCharToChar )
+-import GHC.Handle	( fdToHandle )
++import GHC.IO.Handle	( fdToHandle )
+ 
+ {-# CFILES HsReadline_cbits.c #-}
+ 
diff --git a/ghc-editline.spec b/ghc-editline.spec
index 0320193..d266696 100644
--- a/ghc-editline.spec
+++ b/ghc-editline.spec
@@ -10,6 +10,7 @@ Summary:        Haskell %{pkg_name} library
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Patch1:         editline-0.2.1.1-ghc78-Handle.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -26,10 +27,11 @@ provides a subset of the functionality of the readline library.
 
 %package devel
 Summary:        Haskell %{pkg_name} library development files
+Provides:       %{name}-static = %{version}-%{release}
 Requires:       ghc-compiler = %{ghc_version}
 Requires(post): ghc-compiler = %{ghc_version}
 Requires(postun): ghc-compiler = %{ghc_version}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libedit-devel%{?_isa}
 
 %description devel
@@ -38,6 +40,8 @@ This package provides the Haskell %{pkg_name} library development files.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
+
 cabal-tweak-dep-ver base '< 4.7' '< 4.8'
 
 


More information about the scm-commits mailing list