cabal-rpm 0.2.2 → 0.2.3

raw patch · 3 files changed

+10/−4 lines, 3 files

Files

• cabal-rpm.cabal +1/−1
• src/Distribution/Package/Rpm.hs +8/−0
• src/Distribution/Package/Rpm/Setup.hs +1/−3

@@ -1,5 +1,5 @@ Name: cabal-rpm-Version: 0.2.2+Version: 0.2.3 License: GPL License-File: COPYING Author: Bryan O'Sullivan <bos@serpentine.com>

@@ -1,3 +1,5 @@+{-# LANGUAGE CPP #-}+ -- | -- Module      :  Distribution.Package.Rpm -- Copyright   :  Bryan O'Sullivan 2007@@ -160,8 +162,14 @@                -> IO (FilePath, [FilePath])  createSpecFile force pkgDesc flags tgtPfx = do+#if __GLASGOW_HASKELL__ < 607+    (compiler, _) <- configCompiler (rpmCompiler flags) Nothing Nothing+                     defaultProgramConfiguration+                     (rpmVerbosity flags)+#else     compiler <- configCompiler (rpmCompiler flags) Nothing Nothing                 (rpmVerbosity flags)+#endif     now <- getCurrentTime     defRelease <- defaultRelease now     let pkg = package pkgDesc

@@ -83,8 +83,6 @@              "Don't generate API docs",       Option "" ["disable-library-profiling"] (NoArg (\x -> x { rpmLibProf = False }))              "Don't generate profiling libraries",-      Option "" ["disable-optimisation"] (NoArg (\x -> x { rpmOptimisation = False }))-             "Don't generate optimised code",       Option "" ["disable-optimization"] (NoArg (\x -> x { rpmOptimisation = False }))              "Don't generate optimised code",       Option "" ["disable-split-objs"] (NoArg (\x -> x { rpmSplitObjs = False }))@@ -94,7 +92,7 @@       Option "" ["topdir"] (ReqArg (\path x -> x { rpmTopDir = Just path }) "TOPDIR")              "Override the default build directory",       Option "v" ["verbose"] (ReqArg (\verb x -> x { rpmVerbosity = flagToVerbosity (Just verb) }) "n")-             "Override the default build directory",+             "Change build verbosity",       Option "" ["version"] (ReqArg (\vers x -> x { rpmVersion = Just vers }) "VERSION")              "Override the default package version"     ]