Hello community,
here is the log from the commit of package cabal-rpm for openSUSE:Factory
checked in at 2016-05-17 17:14:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old)
and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cabal-rpm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2016-03-31
13:02:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-05-17
17:14:28.000000000 +0200
@@ -1,0 +2,6 @@
+Sat May 7 06:18:12 UTC 2016 - mimi...@gmail.com
+
+- update to 0.9.11
+* build with Cabal-1.24
+
+-------------------------------------------------------------------
Old:
----
cabal-rpm-0.9.10.tar.gz
New:
----
cabal-rpm-0.9.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cabal-rpm.spec ++++++
--- /var/tmp/diff_new_pack.ngGH2H/_old 2016-05-17 17:14:29.000000000 +0200
+++ /var/tmp/diff_new_pack.ngGH2H/_new 2016-05-17 17:14:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: cabal-rpm
-Version: 0.9.10
+Version: 0.9.11
Release: 0
Summary: RPM packaging tool for Haskell Cabal-based packages
License: GPL-3.0+
++++++ cabal-rpm-0.9.10.tar.gz -> cabal-rpm-0.9.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/ChangeLog
new/cabal-rpm-0.9.11/ChangeLog
--- old/cabal-rpm-0.9.10/ChangeLog 2016-03-24 08:29:55.000000000 +0100
+++ new/cabal-rpm-0.9.11/ChangeLog 2016-05-06 13:31:16.000000000 +0200
@@ -1,3 +1,6 @@
+* 0.9.11 (2016-05-06)
+- build with Cabal-1.24
+
* 0.9.10 (2016-03-24)
- bugfixes
- update no longer tries to grep non-existent .git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/cabal-rpm.cabal
new/cabal-rpm-0.9.11/cabal-rpm.cabal
--- old/cabal-rpm-0.9.10/cabal-rpm.cabal 2016-03-24 08:29:55.000000000
+0100
+++ new/cabal-rpm-0.9.11/cabal-rpm.cabal 2016-05-06 13:31:16.000000000
+0200
@@ -1,5 +1,5 @@
Name: cabal-rpm
-Version: 0.9.10
+Version: 0.9.11
Synopsis: RPM packaging tool for Haskell Cabal-based packages
Description:
This package provides a RPM packaging tool for Haskell Cabal-based
packages.
@@ -34,7 +34,7 @@
Executable cblrpm
Main-is: Main.hs
Build-depends: base < 5,
- Cabal > 1.10 && < 1.24,
+ Cabal > 1.10 && < 1.25,
directory,
filepath,
process,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/src/Commands/Spec.hs
new/cabal-rpm-0.9.11/src/Commands/Spec.hs
--- old/cabal-rpm-0.9.10/src/Commands/Spec.hs 2016-03-24 08:29:55.000000000
+0100
+++ new/cabal-rpm-0.9.11/src/Commands/Spec.hs 2016-05-06 13:31:16.000000000
+0200
@@ -66,7 +66,7 @@
then do
now <- getCurrentTime
return $ formatTime defaultTimeLocale "0.%Y%m%d" now
- else return $ if (distro == SUSE) then "0" else "1"
+ else return $ if distro == SUSE then "0" else "1"
rstrip :: (Char -> Bool) -> String -> String
rstrip p = reverse . dropWhile p . reverse
@@ -100,7 +100,7 @@
if specAlreadyExists
then notice verbose $ specFile +-+ "exists:" +-+ if rpmForce flags then
"forcing overwrite" else "creating" +-+ specFile'
else do
- let realdir dir = ("cblrpm." `isPrefixOf` takeBaseName dir)
+ let realdir dir = "cblrpm." `isPrefixOf` takeBaseName dir
when (maybe True realdir mdest) $
putStrLn pkgname
@@ -274,7 +274,7 @@
let execs = sort $ map exeName $ filter isBuildable $ executables pkgDesc
when selfdep $ do
putNewline
- put $ "%ghc_fix_dynamic_rpath" +-+ intercalate " " (map (\ p -> if p ==
name then "%{pkg_name}" else p) execs)
+ put $ "%ghc_fix_dynamic_rpath" +-+ unwords (map (\ p -> if p == name then
"%{pkg_name}" else p) execs)
let licensefiles =
#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,20,0)
@@ -312,7 +312,7 @@
docs <- findDocs cabalPath licensefiles
- let license_macro = if (distro == Fedora) then "%license" else "%doc"
+ let license_macro = if distro == Fedora then "%license" else "%doc"
when hasExecPkg $ do
put "%files"
@@ -345,7 +345,7 @@
when (distro /= Fedora) $ put "%defattr(-,root,root,-)"
unless (null docs) $
put $ "%doc" +-+ unwords docs
- when (not binlib) $
+ unless binlib $
mapM_ (\ p -> put $ "%{_bindir}/" ++ (if p == name then "%{pkg_name}"
else p)) execs
putNewline
putNewline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/src/Dependencies.hs
new/cabal-rpm-0.9.11/src/Dependencies.hs
--- old/cabal-rpm-0.9.10/src/Dependencies.hs 2016-03-24 08:29:55.000000000
+0100
+++ new/cabal-rpm-0.9.11/src/Dependencies.hs 2016-05-06 13:31:16.000000000
+0200
@@ -26,7 +26,7 @@
import SysCmd (cmd, cmdBool, repoquery, (+-+))
import Control.Applicative ((<$>))
-import Control.Monad (filterM, liftM)
+import Control.Monad (filterM)
import Data.List (delete, nub)
import Data.Maybe (catMaybes)
@@ -133,7 +133,7 @@
notInstalled :: String -> IO Bool
notInstalled dep =
- liftM not $ cmdBool $ "rpm -q --whatprovides" +-+ shellQuote dep
+ fmap not $ cmdBool $ "rpm -q --whatprovides" +-+ shellQuote dep
where
shellQuote :: String -> String
shellQuote (c:cs) = (if c `elem` "()" then (['\\', c] ++) else (c:))
(shellQuote cs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/src/PackageUtils.hs
new/cabal-rpm-0.9.11/src/PackageUtils.hs
--- old/cabal-rpm-0.9.10/src/PackageUtils.hs 2016-03-24 08:29:55.000000000
+0100
+++ new/cabal-rpm-0.9.11/src/PackageUtils.hs 2016-05-06 13:31:16.000000000
+0200
@@ -220,7 +220,7 @@
latestPkg :: String -> IO String
latestPkg pkg = do
contains_pkg <- lines <$> cmd "cabal" ["list", "-v0", "--simple-output", pkg]
- let pkgs = filter ((== pkg) . takeWhile (not . (== ' '))) contains_pkg
+ let pkgs = filter ((== pkg) . takeWhile (/= ' ')) contains_pkg
if null pkgs
then error $ pkg ++ " hackage not found"
else return $ map (\c -> if c == ' ' then '-' else c) $ last pkgs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-rpm-0.9.10/src/SysCmd.hs
new/cabal-rpm-0.9.11/src/SysCmd.hs
--- old/cabal-rpm-0.9.10/src/SysCmd.hs 2016-03-24 08:29:55.000000000 +0100
+++ new/cabal-rpm-0.9.11/src/SysCmd.hs 2016-05-06 13:31:16.000000000 +0200
@@ -33,10 +33,10 @@
import Data.List ((\\))
import Data.Maybe (fromMaybe, isJust, isNothing)
-import Distribution.Simple.Utils (die)
#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,18,0)
import Distribution.Simple.Program.Find (defaultProgramSearchPath,
findProgramOnSearchPath)
+import Distribution.Simple.Utils (die)
#else
import Distribution.Simple.Utils (die, findProgramLocation)
#endif
@@ -46,12 +46,15 @@
import System.Process (readProcess, readProcessWithExitCode, system, rawSystem)
import System.Exit (ExitCode(..))
-findProgram :: String -> IO (Maybe FilePath)
-findProgram =
+findProgram :: FilePath -> IO (Maybe FilePath)
+findProgram prog =
#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,18,0)
- findProgramOnSearchPath normal defaultProgramSearchPath
+ findProgramOnSearchPath normal defaultProgramSearchPath prog
+#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,23,0)
+ >>= return . fmap fst
+#endif
#else
- findProgramLocation normal
+ findProgramLocation normal prog
#endif
requireProgram :: String -> IO ()
