cabal-rpm 0.2.4 → 0.2.5

raw patch · 3 files changed

+19/−17 lines, 3 filesdep ~Cabal

Dependency ranges changed: Cabal

Files

• cabal-rpm.cabal +2/−2
• src/Distribution/Package/Rpm.hs +16/−14
• src/Distribution/Package/Rpm/Setup.hs +1/−1

@@ -1,5 +1,5 @@ Name: cabal-rpm-Version: 0.2.4+Version: 0.2.5 License: GPL License-File: COPYING Author: Bryan O'Sullivan <bos@serpentine.com>@@ -9,7 +9,7 @@ Stability: Experimental Category: Distribution Build-type: Simple-Build-depends: base, Cabal >= 1.1.7, filepath, time >= 1.1, unix+Build-depends: base, Cabal >= 1.2.0, filepath, time >= 1.1, unix Synopsis: RPM package builder for Haskell Cabal source packages. Description:   This package turns Haskell Cabal source packages into source and

@@ -39,12 +39,12 @@ import System.Process (runInteractiveCommand, waitForProcess)  import System.FilePath ((</>))-import Distribution.Compiler (CompilerFlavor(..), Compiler(..),-                              compilerVersion)+import Distribution.Simple.Compiler (CompilerFlavor(..), Compiler(..),+                                     compilerVersion) import Distribution.License import Distribution.Package (PackageIdentifier(..))-import Distribution.PreProcess (knownSuffixHandlers)-import Distribution.Program (defaultProgramConfiguration)+import Distribution.Simple.PreProcess (knownSuffixHandlers)+import Distribution.Simple.Program (defaultProgramConfiguration) import Distribution.Simple.Configure (configCompiler, configure,                                       maybeGetPersistBuildConfig) import Distribution.Simple.LocalBuildInfo (LocalBuildInfo, distPref)@@ -61,7 +61,7 @@                                         withLib) import Distribution.Verbosity (Verbosity(..)) import Distribution.Version (Dependency(..), VersionRange(..), withinRange)-import Distribution.Setup (emptyConfigFlags)+import Distribution.Simple.Setup (emptyConfigFlags) import Distribution.Package.Rpm.Setup (RpmFlags(..)) import System.Posix.Files (setFileCreationMask) @@ -303,6 +303,7 @@     put "%build"     put "if [ -f configure.ac -a ! -f configure ]; then autoreconf; fi"     putSetup ("configure --prefix=%{_prefix} --libdir=%{_libdir} " +++              "--docdir=%{_docdir}/%{hsc_namever}-%{name}-%{version} " ++               "--libsubdir='$compiler/$pkgid' " ++               (if (rpmLibProf flags) then "--enable" else "--disable") ++               "-library-profiling --" ++ cmplr)@@ -445,13 +446,14 @@ virtualPackage compiler name = name ++ '-' : compilerNameVersion compiler  compilerNameVersion :: Compiler -> String-compilerNameVersion (Compiler flavour (PackageIdentifier _ version) _ _ _) = name ++ squishedVersion-    where name = case flavour of-                 GHC -> "ghc"-                 Hugs -> "hugs"-                 JHC -> "jhc"-                 NHC -> "nhc"-          squishedVersion = (concat . map show . versionBranch) version+compilerNameVersion (Compiler flavour (PackageIdentifier _ version) _) =+    name ++ squishedVersion+  where name = case flavour of+               GHC -> "ghc"+               Hugs -> "hugs"+               JHC -> "jhc"+               NHC -> "nhc"+        squishedVersion = (concat . map show . versionBranch) version  -- | Convert from license to RPM-friendly description.  The strings are -- taken from TagsCheck.py in the rpmlint distribution.@@ -549,7 +551,7 @@  showRuntimeReq :: Verbosity -> Compiler -> PackageDescription -> IO String -showRuntimeReq verbose c@(Compiler cFlav (PackageIdentifier _ cVersion) _ _ _)+showRuntimeReq verbose c@(Compiler cFlav (PackageIdentifier _ cVersion) _)                pkgDesc = do     let externalDeps = filter (not . isBuiltIn cFlav cVersion)                        (buildDepends pkgDesc)@@ -564,7 +566,7 @@              -> IO String  showBuildReq verbose haddock-             c@(Compiler cFlav (PackageIdentifier _ cVersion) _ _ _) pkgDesc =+             c@(Compiler cFlav (PackageIdentifier _ cVersion) _) pkgDesc =   do     cPkg <- case cFlav of               GHC -> return "ghc"

@@ -18,7 +18,7 @@     ) where  import Control.Monad (when)-import Distribution.Setup (defaultCompilerFlavor, CompilerFlavor(..))+import Distribution.Simple.Setup (defaultCompilerFlavor, CompilerFlavor(..)) import Distribution.Verbosity (Verbosity(..), flagToVerbosity, normal) import System.Console.GetOpt (ArgDescr (..), ArgOrder (..), OptDescr (..),                               usageInfo, getOpt')