From bb25c9e3716dd72a314f0a275da69eb16bc1b4f0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 29 Oct 2014 01:13:22 +0900 Subject: [PATCH] update to 0.3.4 --- .gitignore | 1 + entropy-0.2.2.1-no-TH.patch | 30 ------------------------------ ghc-entropy.spec | 15 ++++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 entropy-0.2.2.1-no-TH.patch diff --git a/.gitignore b/.gitignore index d5164a7..4f5c108 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/entropy-0.2.2.1-no-TH.patch b/entropy-0.2.2.1-no-TH.patch deleted file mode 100644 index a0f9730..0000000 --- a/entropy-0.2.2.1-no-TH.patch +++ /dev/null @@ -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 " - , "int main() {" diff --git a/ghc-entropy.spec b/ghc-entropy.spec index 03790f8..00c93fe 100644 --- a/ghc-entropy.spec +++ b/ghc-entropy.spec @@ -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 - 0.3.4-1 +- update to 0.3.4 + * Sat Aug 16 2014 Fedora Release Engineering - 0.2.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index cc30b56..e822808 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64e67e78842f3ab8bb77a8ff7218b83a entropy-0.2.2.1.tar.gz +e1de82bcdebc64ccc49d085177b34565 entropy-0.3.4.tar.gz