Hello community, here is the log from the commit of package ghc-mtl for openSUSE:Factory checked in at 2014-11-26 20:54:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-mtl (Old) and /work/SRC/openSUSE:Factory/.ghc-mtl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-mtl" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-mtl/ghc-mtl.changes 2014-08-25 11:05:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-mtl.new/ghc-mtl.changes 2014-11-26 20:54:54.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Sep 12 06:28:38 UTC 2014 - peter.trommler@ohm-hochschule.de + +- update to 2.1.3.1 +* no changelog +* Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Tue Sep 2 09:35:29 UTC 2014 - peter.trommler@ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- Old: ---- mtl-2.1.2.tar.gz New: ---- mtl-2.1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-mtl.spec ++++++ --- /var/tmp/diff_new_pack.lj3YXG/_old 2014-11-26 20:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.lj3YXG/_new 2014-11-26 20:54:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-mtl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,40 +18,43 @@ %global pkg_name mtl -%global common_summary Haskell Monad classes, using functional dependencies - -%global common_description Monad classes using functional dependencies, with instances for various monad transformers, inspired by the paper Functional Programming with Overloading and Higher-Order Polymorphism, by Mark P Jones, in Advanced School of Functional Programming, 1995 (http://web.cecs.pdx.edu/~mpj/pubs/springschool.html). - Name: ghc-mtl -Version: 2.1.2 +Version: 2.1.3.1 Release: 0 -Summary: %{common_summary} +Summary: Monad classes, using functional dependencies License: BSD-3-Clause Group: System/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# BEGIN cabal2spec Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-transformers-devel -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +Monad classes using functional dependencies, with instances for various monad +transformers, inspired by the paper /Functional Programming with Overloading +and Higher-Order Polymorphism/, by Mark P Jones, in /Advanced School of +Functional Programming/, 1995 +(<http://web.cecs.pdx.edu/~mpj/pubs/springschool.html>). + %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Languages/Other -Requires: ghc-compiler -Requires(post): ghc-compiler -Requires(postun): ghc-compiler +Group: Development/Libraries/Other +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} Requires: %{name} = %{version}-%{release} %description devel -%{common_description} -This package contains the development files. +This package provides the Haskell %{pkg_name} library development files. + %prep %setup -q -n %{pkg_name}-%{version} ++++++ mtl-2.1.2.tar.gz -> mtl-2.1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtl-2.1.2/CHANGELOG.markdown new/mtl-2.1.3.1/CHANGELOG.markdown --- old/mtl-2.1.2/CHANGELOG.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/mtl-2.1.3.1/CHANGELOG.markdown 2014-03-24 19:50:13.000000000 +0100 @@ -0,0 +1,7 @@ +2.1.3.1 +------- +* Avoid importing `Control.Monad.Instances` on GHC 7.8 to build without deprecation warnings. + +2.1.3 +----- +* Removed the now-irrelevant `Error` constraint from the `MonadError` instance for `Either e`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtl-2.1.2/Control/Monad/Error/Class.hs new/mtl-2.1.3.1/Control/Monad/Error/Class.hs --- old/mtl-2.1.2/Control/Monad/Error/Class.hs 2012-06-23 05:10:36.000000000 +0200 +++ new/mtl-2.1.3.1/Control/Monad/Error/Class.hs 2014-03-24 19:50:13.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE UndecidableInstances #-} {- | @@ -55,7 +56,11 @@ import Control.Monad.Trans.Class (lift) import Control.Exception (IOException, catch, ioError) import Control.Monad + +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 707 import Control.Monad.Instances () +#endif + import Data.Monoid import Prelude (Either(..), (.), IO) @@ -97,7 +102,7 @@ -- --------------------------------------------------------------------------- -- Our parameterizable error monad -instance Error e => MonadError e (Either e) where +instance MonadError e (Either e) where throwError = Left Left l `catchError` h = h l Right r `catchError` _ = Right r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtl-2.1.2/Control/Monad/Error.hs new/mtl-2.1.3.1/Control/Monad/Error.hs --- old/mtl-2.1.2/Control/Monad/Error.hs 2012-06-23 05:10:36.000000000 +0200 +++ new/mtl-2.1.3.1/Control/Monad/Error.hs 2014-03-24 19:50:13.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {- | Module : Control.Monad.Error Copyright : (c) Michael Weber <michael.weber@post.rwth-aachen.de> 2001, @@ -54,7 +55,10 @@ import Control.Monad import Control.Monad.Fix + +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 707 import Control.Monad.Instances () +#endif {- $customErrorExample Here is an example that demonstrates the use of a custom 'Error' data type with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mtl-2.1.2/mtl.cabal new/mtl-2.1.3.1/mtl.cabal --- old/mtl-2.1.2/mtl.cabal 2012-06-23 05:10:36.000000000 +0200 +++ new/mtl-2.1.3.1/mtl.cabal 2014-03-24 19:50:13.000000000 +0100 @@ -1,5 +1,5 @@ name: mtl -version: 2.1.2 +version: 2.1.3.1 cabal-version: >= 1.6 license: BSD3 license-file: LICENSE @@ -16,6 +16,7 @@ by Mark P Jones, in /Advanced School of Functional Programming/, 1995 (<http://web.cecs.pdx.edu/~mpj/pubs/springschool.html>). build-type: Simple +extra-source-files: CHANGELOG.markdown source-repository head type: git -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org