Hello community,

here is the log from the commit of package cabal-rpm for openSUSE:Factory 
checked in at 2015-05-11 19:38:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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      2015-04-30 
11:51:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-05-11 
19:48:40.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May  4 05:39:58 UTC 2015 - [email protected]
+
+- update to 0.9.5.1
+* add old-locale Cabal flag to fix build on ghc-7.10
+
+-------------------------------------------------------------------

Old:
----
  cabal-rpm-0.9.5.tar.gz

New:
----
  cabal-rpm-0.9.5.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cabal-rpm.spec ++++++
--- /var/tmp/diff_new_pack.fyTplX/_old  2015-05-11 19:48:41.000000000 +0200
+++ /var/tmp/diff_new_pack.fyTplX/_new  2015-05-11 19:48:41.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           cabal-rpm
-Version:        0.9.5
+Version:        0.9.5.1
 Release:        0
 Summary:        RPM packaging tool for Haskell Cabal-based packages
 License:        GPL-3.0+

++++++ cabal-rpm-0.9.5.tar.gz -> cabal-rpm-0.9.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cabal-rpm-0.9.5/ChangeLog 
new/cabal-rpm-0.9.5.1/ChangeLog
--- old/cabal-rpm-0.9.5/ChangeLog       2015-04-20 15:24:51.000000000 +0200
+++ new/cabal-rpm-0.9.5.1/ChangeLog     2015-05-01 11:09:22.000000000 +0200
@@ -1,3 +1,6 @@
+* 0.9.5.1 (2015-05-01)
+- add old-locale Cabal flag to fix build on ghc-7.10
+
 * 0.9.5 (2015-04-20)
 - fix for dnf repoquery
 - create SOURCES/ for tarball
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cabal-rpm-0.9.5/cabal-rpm.cabal 
new/cabal-rpm-0.9.5.1/cabal-rpm.cabal
--- old/cabal-rpm-0.9.5/cabal-rpm.cabal 2015-04-20 15:24:51.000000000 +0200
+++ new/cabal-rpm-0.9.5.1/cabal-rpm.cabal       2015-05-01 11:09:22.000000000 
+0200
@@ -1,5 +1,5 @@
 Name:                cabal-rpm
-Version:             0.9.5
+Version:             0.9.5.1
 Synopsis:            RPM packaging tool for Haskell Cabal-based packages
 Description:
     This package provides a RPM packaging tool for Haskell Cabal-based 
packages.
@@ -27,16 +27,23 @@
   type:     git
   location: https://github.com/juhp/cabal-rpm
 
+Flag old-locale
+  Description:   Use old-locale and time < 1.5
+  Default:       True
+
 Executable cblrpm
     Main-is:            Main.hs
     Build-depends: base < 5,
                    Cabal > 1.10 && < 1.23,
                    directory,
                    filepath,
-                   old-locale,
                    process,
-                   time,
                    unix
+    if flag(old-locale)
+       Build-Depends: old-locale >= 1 && < 1.1,
+                      time >= 1.2 && < 1.5
+    else
+       Build-Depends: time >= 1.5 && < 1.6
     Other-modules:
         Commands.Depends,
         Commands.Diff,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cabal-rpm-0.9.5/src/Commands/Depends.hs 
new/cabal-rpm-0.9.5.1/src/Commands/Depends.hs
--- old/cabal-rpm-0.9.5/src/Commands/Depends.hs 2015-04-20 15:24:51.000000000 
+0200
+++ new/cabal-rpm-0.9.5.1/src/Commands/Depends.hs       2015-05-01 
11:09:22.000000000 +0200
@@ -25,7 +25,7 @@
 import Control.Applicative ((<$>))
 import Control.Monad (filterM, unless, void)
 import Data.List (nub, sort, (\\))
-import System.Directory        (removeDirectoryRecursive)
+import System.Directory (removeDirectoryRecursive)
 
 data Depends = Depends | Requires | Missing
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cabal-rpm-0.9.5/src/Commands/Spec.hs 
new/cabal-rpm-0.9.5.1/src/Commands/Spec.hs
--- old/cabal-rpm-0.9.5/src/Commands/Spec.hs    2015-04-20 15:24:51.000000000 
+0200
+++ new/cabal-rpm-0.9.5.1/src/Commands/Spec.hs  2015-05-01 11:09:22.000000000 
+0200
@@ -47,7 +47,11 @@
 
 import System.Directory (doesFileExist, getDirectoryContents)
 import System.IO     (IOMode (..), hClose, hPutStrLn, openFile)
+#if defined(MIN_VERSION_time) && MIN_VERSION_time(1,5,0)
+import Data.Time.Format (defaultTimeLocale)
+#else
 import System.Locale (defaultTimeLocale)
+#endif
 import System.FilePath (dropFileName, takeBaseName, takeDirectory, (</>))
 
 import qualified Paths_cabal_rpm (version)


Reply via email to