update to 0.3.4

This commit is contained in:
Jens Petersen 2014-10-29 01:13:22 +09:00
parent 1aaa379622
commit bb25c9e371
4 changed files with 10 additions and 38 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/entropy-0.2.1.tar.gz
/entropy-0.2.2.tar.gz
/entropy-0.2.2.1.tar.gz
/entropy-0.3.4.tar.gz

View File

@ -1,30 +0,0 @@
diff --git a/Setup.hs b/Setup.hs
index cee008e..ff13514 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE TemplateHaskell #-}
import Distribution.Simple
import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Setup
@@ -10,7 +9,6 @@ import System.Process
import System.Directory
import System.FilePath
import System.Exit
-import Language.Haskell.TH (appE, varE, mkName, conE)
main = defaultMainWithHooks hk
where
@@ -34,11 +32,7 @@ cArgsHC = map ("-optc" ++) cArgs
canUseRDRAND :: FilePath -> IO Bool
canUseRDRAND cc = do
- -- Template haskell to call withTempDirectory in a backward compatible way
- -- withTempDirectory normal False "" "testRDRAND" $ \tmpDir -> do
- $(if cabalVersion >= Version [1,17,0] []
- then appE (appE (varE $ mkName "withTempDirectory") (varE 'normal)) (conE (mkName "False"))
- else appE (varE $ mkName "withTempDirectory") (varE 'normal)) "" "testRDRAND" $ \tmpDir -> do
+ withTempDirectory normal "" "testRDRAND" $ \tmpDir -> do
writeFile (tmpDir ++ "/testRDRAND.c")
(unlines [ "#include <stdint.h>"
, "int main() {"

View File

@ -2,23 +2,20 @@
%global pkg_name entropy
# Setup uses TH
%global ghc_without_dynamic 1
Name: ghc-%{pkg_name}
Version: 0.2.2.1
Release: 5%{?dist}
Version: 0.3.4
Release: 1%{?dist}
Summary: A platform independent entropy source
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: entropy-0.2.2.1-no-TH.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-unix-devel
# End cabal-rpm deps
%description
@ -41,7 +38,7 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkg_name}-%{version}
%patch1 -p1 -b .orig
%build
%ghc_lib_build
@ -64,9 +61,13 @@ This package provides the Haskell %{pkg_name} library development files.
%files devel -f %{name}-devel.files
%doc README.md
%changelog
* Wed Oct 29 2014 Jens Petersen <petersen@redhat.com> - 0.3.4-1
- update to 0.3.4
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1 +1 @@
64e67e78842f3ab8bb77a8ff7218b83a entropy-0.2.2.1.tar.gz
e1de82bcdebc64ccc49d085177b34565 entropy-0.3.4.tar.gz