November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-parsec for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-parsec for openSUSE:Factory checked in at 2014-11-26 20:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-parsec (Old) and /work/SRC/openSUSE:Factory/.ghc-parsec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-parsec" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-parsec/ghc-parsec.changes 2014-08-25 11:05:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-parsec.new/ghc-parsec.changes 2014-11-26 20:55:01.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Sep 12 06:39:23 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 3.1.5 +* no changelog +* Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Tue Sep 2 09:45:46 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- Old: ---- parsec-3.1.3.tar.gz New: ---- parsec-3.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-parsec.spec ++++++ --- /var/tmp/diff_new_pack.DFZfFv/_old 2014-11-26 20:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.DFZfFv/_new 2014-11-26 20:55:02.000000000 +0100 @@ -1,8 +1,7 @@ # # spec file for package ghc-parsec # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2012 Peter Trommler peter.trommler(a)ohm-hochschule.de +# 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 @@ -17,47 +16,47 @@ # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - %global pkg_name parsec -%global common_summary Haskell monadic parser combinators library - -%global common_description Parsec is designed from scratch as an industrial-strength parser library. It is simple, safe, well documented (on the package homepage), has extensive libraries and good error messages, and is also fast. It is defined as a monad transformer that can be stacked on arbitrary monads, and it is also parametric in the input stream type. - Name: ghc-parsec -Version: 3.1.3 +Version: 3.1.5 Release: 0 -Summary: %{common_summary} +Summary: Monadic parser combinators 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_na… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +Parsec is designed from scratch as an industrial-strength parser library. +It is simple, safe, well documented (on the package homepage), has extensive +libraries and good error messages, and is also fast. It is defined as a monad +transformer that can be stacked on arbitrary monads, and it is also parametric +in the input stream type. + %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} ++++++ parsec-3.1.3.tar.gz -> parsec-3.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parsec-3.1.3/CHANGES new/parsec-3.1.5/CHANGES --- old/parsec-3.1.3/CHANGES 2012-06-12 04:03:42.000000000 +0200 +++ new/parsec-3.1.5/CHANGES 2014-01-11 07:13:34.000000000 +0100 @@ -1,3 +1,6 @@ +3.1.4 & 3.1.5 + +- Bump dependency on 'text' 3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parsec-3.1.3/Text/Parsec/Token.hs new/parsec-3.1.5/Text/Parsec/Token.hs --- old/parsec-3.1.3/Text/Parsec/Token.hs 2012-06-12 04:03:42.000000000 +0200 +++ new/parsec-3.1.5/Text/Parsec/Token.hs 2014-01-11 07:13:34.000000000 +0100 @@ -38,7 +38,7 @@ type LanguageDef st = GenLanguageDef String st Identity -- | The @GenLanguageDef@ type is a record that contains all parameterizable --- features of the 'Text.Parsec.Token' module. The module 'Text.Parsec.Language' +-- features of the "Text.Parsec.Token" module. The module "Text.Parsec.Language" -- contains some default definitions. data GenLanguageDef s u m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parsec-3.1.3/parsec.cabal new/parsec-3.1.5/parsec.cabal --- old/parsec-3.1.3/parsec.cabal 2012-06-12 04:03:42.000000000 +0200 +++ new/parsec-3.1.5/parsec.cabal 2014-01-11 07:13:34.000000000 +0100 @@ -1,5 +1,5 @@ name: parsec -version: 3.1.3 +version: 3.1.5 cabal-version: >= 1.6 license: BSD3 license-file: LICENSE @@ -25,7 +25,7 @@ source-repository this type: darcs location: http://code.haskell.org/parsec3 - tag: 3.1.3 + tag: 3.1.5 flag base4 Description: Use base-4.* @@ -63,6 +63,6 @@ else build-depends: base >= 3.0.3 && < 4 cpp-options: -DBASE3 - build-depends: mtl, bytestring, text >= 0.2 && < 0.12 + build-depends: mtl, bytestring, text >= 0.2 && < 1.2 extensions: ExistentialQuantification, PolymorphicComponents, MultiParamTypeClasses, FlexibleInstances, FlexibleContexts, DeriveDataTypeable, CPP ghc-options: -O2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-parallel for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-parallel for openSUSE:Factory checked in at 2014-11-26 20:54:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-parallel (Old) and /work/SRC/openSUSE:Factory/.ghc-parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-parallel/ghc-parallel.changes 2014-08-25 11:05:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-parallel.new/ghc-parallel.changes 2014-11-26 20:54:59.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Sep 12 06:37:30 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 3.2.0.4 +* no changelog +* Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Tue Sep 2 09:38:53 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- Old: ---- parallel-3.2.0.3.tar.gz New: ---- parallel-3.2.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-parallel.spec ++++++ --- /var/tmp/diff_new_pack.C1Lw7z/_old 2014-11-26 20:55:00.000000000 +0100 +++ /var/tmp/diff_new_pack.C1Lw7z/_new 2014-11-26 20:55:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-parallel # -# 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,42 +18,41 @@ %global pkg_name parallel -%global common_summary Haskell %{pkg_name} library - -%global common_description A %{pkg_name} library for Haskell. - Name: ghc-parallel -Version: 3.2.0.3 +Version: 3.2.0.4 Release: 0 -Summary: %{common_summary} +Summary: Parallel programming library 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_na… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-rpm-macros -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +This package provides a library for parallel programming. + %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} ++++++ parallel-3.2.0.3.tar.gz -> parallel-3.2.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.2.0.3/Control/Parallel/Strategies.hs new/parallel-3.2.0.4/Control/Parallel/Strategies.hs --- old/parallel-3.2.0.3/Control/Parallel/Strategies.hs 2012-05-16 17:29:33.000000000 +0200 +++ new/parallel-3.2.0.4/Control/Parallel/Strategies.hs 2013-11-05 14:50:46.000000000 +0100 @@ -1,10 +1,10 @@ -{-# LANGUAGE MagicHash, UnboxedTuples #-} +{-# LANGUAGE BangPatterns, CPP, MagicHash, UnboxedTuples #-} ----------------------------------------------------------------------------- -- | -- Module : Control.Parallel.Strategies -- Copyright : (c) The University of Glasgow 2001-2010 -- License : BSD-style (see the file libraries/base/LICENSE) --- +-- -- Maintainer : libraries(a)haskell.org -- Stability : experimental -- Portability : portable @@ -29,7 +29,7 @@ -- -- * 'Monad' and 'Applicative' instances are provided, for quickly building -- strategies that involve traversing structures in a regular way. --- +-- -- For API history and changes in this release, see "Control.Parallel.Strategies#history". ----------------------------------------------------------------------------- @@ -121,7 +121,7 @@ -- $history -- * Backwards compatibility - + -- | These functions and types are all deprecated, and will be -- removed in a future release. In all cases they have been -- either renamed or replaced with equivalent functionality. @@ -156,7 +156,7 @@ -- Eval monad (isomorphic to Lift monad from MonadLib 3.6.1) -- | 'Eval' is a Monad that makes it easier to define parallel --- strategies. It is a strict identity monad: that is, in +-- strategies. It is a strict identity monad: that is, in -- -- > m >>= f -- @@ -258,7 +258,7 @@ -- | A 'Strategy' is a function that embodies a parallel evaluation strategy. -- The function traverses (parts of) its argument, evaluating subexpressions -- in parallel or in sequence. --- +-- -- A 'Strategy' may do an arbitrary amount of evaluation of its -- argument, but should not return a value different from the one it -- was passed. @@ -269,7 +269,7 @@ -- intention is that the program applies the 'Strategy' to a -- structure, and then uses the returned value, discarding the old -- value. This idiom is expressed by the 'using' function. --- +-- type Strategy a = a -> Eval a -- | Evaluate a value using the given 'Strategy'. @@ -281,11 +281,11 @@ -- | evaluate a value using the given 'Strategy'. This is simply -- 'using' with the arguments reversed. --- +-- withStrategy :: Strategy a -> a -> a withStrategy = flip using --- | Compose two strategies sequentially. +-- | Compose two strategies sequentially. -- This is the analogue to function composition on strategies. -- -- > strat2 `dot` strat1 == strat2 . withStrategy strat1 @@ -411,7 +411,7 @@ -- -------------------------------------------------------------------------- -- Strategy combinators for Traversable data types --- | Evaluate the elements of a traversable data structure +-- | Evaluate the elements of a traversable data structure -- according to the given strategy. evalTraversable :: Traversable t => Strategy a -> Strategy (t a) evalTraversable = traverse @@ -506,7 +506,8 @@ -- The non-compositional 'parListWHNF' might be more efficient than its -- more compositional counterpart; use RULES to do the specialisation. -{-# RULES +{-# NOINLINE [1] parList #-} +{-# RULES "parList/rseq" parList rseq = parListWHNF #-} @@ -518,7 +519,7 @@ -- > parMap strat f = withStrategy (parList strat) . map f -- parMap :: Strategy b -> (a -> b) -> [a] -> [b] -parMap strat f = (`using` parList strat) . map f +parMap strat f = (`using` parList strat) . map f -- -------------------------------------------------------------------------- -- Strategies for lazy lists @@ -542,7 +543,7 @@ -- 'evalBuffer' is not as compositional as the type suggests. In fact, -- it evaluates list elements at least to weak head normal form, -- disregarding a strategy argument 'r0'. --- +-- -- > evalBuffer n r0 == evalBuffer n rseq -- evalBuffer :: Int -> Strategy a -> Strategy [a] @@ -573,7 +574,9 @@ -- Deforest the intermediate list in parBuffer/evalBuffer when it is -- unnecessary: -{-# RULES +{-# NOINLINE [1] evalBuffer #-} +{-# NOINLINE [1] parBuffer #-} +{-# RULES "evalBuffer/rseq" forall n . evalBuffer n rseq = evalBufferWHNF n "parBuffer/rseq" forall n . parBuffer n rseq = parBufferWHNF n #-} @@ -666,34 +669,34 @@ f $|| s = \ x -> let z = x `using` s in z `par` f z -- | Sequential function composition. The result of --- the second function is evaluated using the given strategy, +-- the second function is evaluated using the given strategy, -- and then given to the first function. (.|) :: (b -> c) -> Strategy b -> (a -> b) -> (a -> c) -(.|) f s g = \ x -> let z = g x `using` s in +(.|) f s g = \ x -> let z = g x `using` s in z `pseq` f z -- | Parallel function composition. The result of the second -- function is evaluated using the given strategy, -- in parallel with the application of the first function. (.||) :: (b -> c) -> Strategy b -> (a -> b) -> (a -> c) -(.||) f s g = \ x -> let z = g x `using` s in +(.||) f s g = \ x -> let z = g x `using` s in z `par` f z --- | Sequential inverse function composition, +-- | Sequential inverse function composition, -- for those who read their programs from left to right. --- The result of the first function is evaluated using the +-- The result of the first function is evaluated using the -- given strategy, and then given to the second function. (-|) :: (a -> b) -> Strategy b -> (b -> c) -> (a -> c) -(-|) f s g = \ x -> let z = f x `using` s in +(-|) f s g = \ x -> let z = f x `using` s in z `pseq` g z -- | Parallel inverse function composition, -- for those who read their programs from left to right. --- The result of the first function is evaluated using the --- given strategy, in parallel with the application of the +-- The result of the first function is evaluated using the +-- given strategy, in parallel with the application of the -- second function. (-||) :: (a -> b) -> Strategy b -> (b -> c) -> (a -> c) -(-||) f s g = \ x -> let z = f x `using` s in +(-||) f s g = \ x -> let z = f x `using` s in z `par` g z -- ----------------------------------------------------------------------------- @@ -715,12 +718,12 @@ {-# DEPRECATED (>|) "Use pseq or $| instead" #-} -- | DEPRECATED: Use 'pseq' or '$|' instead -(>|) :: Done -> Done -> Done +(>|) :: Done -> Done -> Done (>|) = Prelude.seq {-# DEPRECATED (>||) "Use par or $|| instead" #-} -- | DEPRECATED: Use 'par' or '$||' instead -(>||) :: Done -> Done -> Done +(>||) :: Done -> Done -> Done (>||) = par {-# DEPRECATED rwhnf "renamed to rseq" #-} @@ -781,7 +784,7 @@ The original Strategies design is described in /Algorithm + Strategy = Parallelism/ <http://www.macs.hw.ac.uk/~dsg/gph/papers/html/Strategies/strategies.html> and the code was written by - Phil Trinder, Hans-Wolfgang Loidl, Kevin Hammond et al. + Phil Trinder, Hans-Wolfgang Loidl, Kevin Hammond et al. Version 2.x @@ -845,7 +848,7 @@ (version 2.3 was not released on Hackage). Version 3 introduced a major overhaul of the API, to match what is -presented in the paper +presented in the paper /Seq no More: Better Strategies for Parallel Haskell/ <http://www.haskell.org/~simonmar/papers/strategies.pdf> @@ -857,14 +860,14 @@ * Changes to the naming scheme: 'rwhnf' renamed to 'rseq', 'seqList' renamed to 'evalList', 'seqPair' renamed to - 'evalTuple2', + 'evalTuple2', The naming scheme is now as follows: * Basic polymorphic strategies (of type @'Strategy' a@) are called @r...@. Examples: 'r0', 'rseq', 'rpar', 'rdeepseq'. - * A strategy combinator for a particular type constructor + * A strategy combinator for a particular type constructor or constructor class @T@ is called @evalT...@, @parT...@ or @seqT...@. * The @seqT...@ combinators (residing in module @@ -888,4 +891,3 @@ 'parBuffer', which are not named after their type constructor (lists) but after their function (rolling buffer of fixed size). -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.2.0.3/Control/Parallel.hs new/parallel-3.2.0.4/Control/Parallel.hs --- old/parallel-3.2.0.3/Control/Parallel.hs 2012-05-16 17:29:33.000000000 +0200 +++ new/parallel-3.2.0.4/Control/Parallel.hs 2013-11-05 14:50:46.000000000 +0100 @@ -1,9 +1,11 @@ +{-# LANGUAGE CPP #-} + ----------------------------------------------------------------------------- -- | -- Module : Control.Parallel -- Copyright : (c) The University of Glasgow 2001 -- License : BSD-style (see the file libraries/base/LICENSE) --- +-- -- Maintainer : libraries(a)haskell.org -- Stability : stable -- Portability : portable @@ -17,7 +19,7 @@ ) where #ifdef __GLASGOW_HASKELL__ -import qualified GHC.Conc ( par, pseq ) +import qualified GHC.Conc ( par, pseq ) infixr 0 `par`, `pseq` #endif @@ -27,7 +29,7 @@ -- | Indicates that it may be beneficial to evaluate the first -- argument in parallel with the second. Returns the value of the -- second argument. --- +-- -- @a ``par`` b@ is exactly equivalent semantically to @b@. -- -- @par@ is generally used when the value of @a@ is likely to be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.2.0.3/changelog new/parallel-3.2.0.4/changelog --- old/parallel-3.2.0.3/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/parallel-3.2.0.4/changelog 2013-11-05 14:50:46.000000000 +0100 @@ -0,0 +1,8 @@ +-*-change-log-*- + +3.2.0.4 Nov 2013 + * Update package description to Cabal 1.10 format + * Add support for GHC 7.8 + * Drop support for GHCs older than GHC 7.0.1 + * Add NOINLINE pragmas to `parBuffer`, `parList`, and `evalBuffer` + to make RULEs more likely to fire diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.2.0.3/parallel.cabal new/parallel-3.2.0.4/parallel.cabal --- old/parallel-3.2.0.3/parallel.cabal 2012-05-16 17:29:33.000000000 +0200 +++ new/parallel-3.2.0.4/parallel.cabal 2013-11-05 14:50:46.000000000 +0100 @@ -1,33 +1,49 @@ -name: parallel -version: 3.2.0.3 -license: BSD3 -license-file: LICENSE -maintainer: libraries(a)haskell.org -synopsis: Parallel programming library +name: parallel +version: 3.2.0.4 +license: BSD3 +license-file: LICENSE +maintainer: libraries(a)haskell.org +synopsis: Parallel programming library +category: Control, Parallelism +build-type: Simple +cabal-version: >=1.10 +tested-with: GHC==7.6.3, GHC==7.6.2, GHC==7.6.1, GHC==7.4.2, GHC==7.4.1, GHC==7.2.2, GHC==7.2.1, GHC==7.0.4, GHC==7.0.3, GHC==7.0.2, GHC==7.0.1 description: This package provides a library for parallel programming. -category: Control -build-type: Simple -cabal-version: >=1.6 + +extra-source-files: changelog source-repository head type: git - location: http://darcs.haskell.org/packages/parallel.git/ + location: http://git.haskell.org/packages/parallel.git + +source-repository this + type: git + location: http://git.haskell.org/packages/parallel.git + tag: parallel-3.2.0.4-release -library { - exposed-modules: +library + default-language: Haskell2010 + other-extensions: + BangPatterns + CPP + FlexibleInstances + MagicHash + UnboxedTuples + + exposed-modules: Control.Seq Control.Parallel Control.Parallel.Strategies - extensions: CPP BangPatterns - build-depends: base >= 3 && < 5, - deepseq >= 1.1 && < 1.4, - containers >= 0.1 && < 0.6, - array >= 0.1 && < 0.5 - ghc-options: -Wall - - if impl(ghc >= 6.11) { - -- To improve parallel performance: - ghc-options: -feager-blackholing - } -} + + build-depends: + array >= 0.3 && < 0.6, + base >= 4.3 && < 4.8, + containers >= 0.4 && < 0.6, + deepseq >= 1.1 && < 1.4 + + ghc-options: -Wall + + if impl(ghc >= 6.11) + -- To improve parallel performance: + ghc-options: -feager-blackholing -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-OpenGLRaw for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-OpenGLRaw for openSUSE:Factory checked in at 2014-11-26 20:54:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGLRaw (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGLRaw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OpenGLRaw" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGLRaw/ghc-OpenGLRaw.changes 2014-08-25 11:05:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGLRaw.new/ghc-OpenGLRaw.changes 2014-11-26 20:54:58.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Sep 9 20:14:08 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 1.5.0.0 +* no changelog +* for Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Mon Sep 1 17:26:56 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file with cabal-rpm + +------------------------------------------------------------------- Old: ---- OpenGLRaw-1.3.0.0.tar.gz New: ---- OpenGLRaw-1.5.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGLRaw.spec ++++++ --- /var/tmp/diff_new_pack.TkvjuO/_old 2014-11-26 20:54:59.000000000 +0100 +++ /var/tmp/diff_new_pack.TkvjuO/_new 2014-11-26 20:54:59.000000000 +0100 @@ -19,22 +19,19 @@ %global pkg_name OpenGLRaw -%global common_summary Haskell %{pkg_name} library - -%global common_description A %{pkg_name} library for Haskell. - Name: ghc-OpenGLRaw -Version: 1.3.0.0 +Version: 1.5.0.0 Release: 0 -Summary: %{common_summary} +Summary: A raw binding for the OpenGL graphics system 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_na… Source1: ghc-OpenGLRaw-rpmlintrc +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-rpm-macros @@ -43,27 +40,43 @@ %else BuildRequires: Mesa-libGL-devel %endif -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and lots +of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API, intended +as a basis for a nicer interface. OpenGLRaw offers access to all necessary +functions, tokens and types plus a general facility for loading extension +entries. The module hierarchy closely mirrors the naming structure of the +OpenGL extensions, making it easy to find the right module to import. +All API entries are loaded dynamically, so no special C header files are needed +for building this package. If an API entry is not found at runtime, a userError +is thrown. + +OpenGL is the industry's most widely used and supported 2D and 3D graphics +application programming interface (API), incorporating a broad set of +rendering, texture mapping, special effects, and other powerful visualization +functions. For more information about OpenGL and its various extensions, please +see <http://www.opengl.org/> and <http://www.opengl.org/registry/>. + %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 +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} Requires: %{name} = %{version}-%{release} +# Begin cabal-rpm deps: %if %suse_version < 1230 Requires: Mesa-devel %else Requires: Mesa-libGL-devel %endif +# End cabal-rpm deps %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} @@ -81,10 +94,10 @@ %ghc_pkg_recache %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc LICENSE %files devel -f %{name}-devel.files -%defattr(-,root,root,-) +%defattr(-,root,root) %changelog ++++++ OpenGLRaw-1.3.0.0.tar.gz -> OpenGLRaw-1.5.0.0.tar.gz ++++++ ++++ 11111 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-OpenGL for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-OpenGL for openSUSE:Factory checked in at 2014-11-26 20:54:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGL (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OpenGL" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGL/ghc-OpenGL.changes 2014-08-25 11:05:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGL.new/ghc-OpenGL.changes 2014-11-26 20:54:56.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Sep 2 08:24:54 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 2.9.2.0 for Haskell Platform 2014.2.0.0 +* no changelog + +------------------------------------------------------------------- Old: ---- OpenGL-2.8.0.0.tar.gz New: ---- OpenGL-2.9.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGL.spec ++++++ --- /var/tmp/diff_new_pack.RbA34p/_old 2014-11-26 20:54:57.000000000 +0100 +++ /var/tmp/diff_new_pack.RbA34p/_new 2014-11-26 20:54:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-OpenGL # -# 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 @@ -27,7 +27,7 @@ #' Help EMACS syntax highlighting. Name: ghc-OpenGL -Version: 2.8.0.0 +Version: 2.9.2.0 Release: 0 Summary: %{common_summary} License: BSD-3-Clause @@ -40,7 +40,9 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-GLURaw-devel BuildRequires: ghc-OpenGLRaw-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-text-devel # END cabal2spec ++++++ OpenGL-2.8.0.0.tar.gz -> OpenGL-2.9.2.0.tar.gz ++++++ ++++ 9023 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-network for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-network for openSUSE:Factory checked in at 2014-11-26 20:54:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-network (Old) and /work/SRC/openSUSE:Factory/.ghc-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-network" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-network/ghc-network.changes 2014-08-25 11:05:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-network.new/ghc-network.changes 2014-11-26 20:54:55.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Sep 12 06:31:03 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 2.4.2.3 +* no changelog +* Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Tue Sep 2 09:37:14 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- Old: ---- network-2.4.1.2.tar.gz New: ---- network-2.4.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-network.spec ++++++ --- /var/tmp/diff_new_pack.gy7MAj/_old 2014-11-26 20:54:56.000000000 +0100 +++ /var/tmp/diff_new_pack.gy7MAj/_new 2014-11-26 20:54:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# 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,41 +18,41 @@ %global pkg_name network -%global common_summary Haskell Low-level networking interface library - -%global common_description A low-level networking interface library for Haskell. - Name: ghc-network -Version: 2.4.1.2 +Version: 2.4.2.3 Release: 0 -Summary: %{common_summary} +Summary: Low-level networking interface 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_na… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-parsec-devel -BuildRequires: ghc-rpm-macros -# END cabal2spec +BuildRequires: ghc-unix-devel +# End cabal-rpm deps %description -%{common_description} +Low-level networking interface for Haskell. + %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} @@ -75,5 +75,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc examples README %changelog ++++++ network-2.4.1.2.tar.gz -> network-2.4.2.3.tar.gz ++++++ ++++ 2885 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/BSD.hsc new/network-2.4.2.3/Network/BSD.hsc --- old/network-2.4.1.2/Network/BSD.hsc 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/BSD.hsc 2014-04-18 09:16:03.000000000 +0200 @@ -4,7 +4,7 @@ -- Module : Network.BSD -- Copyright : (c) The University of Glasgow 2001 -- License : BSD-style (see the file libraries/network/LICENSE) --- +-- -- Maintainer : libraries(a)haskell.org -- Stability : experimental -- Portability : non-portable @@ -16,9 +16,6 @@ #include "HsNet.h" --- NOTE: ##, we want this interpreted when compiling the .hs, not by hsc2hs. -##include "Typeable.h" - module Network.BSD ( -- * Host names @@ -141,7 +138,7 @@ -- close the database a call to endServiceEntry is required. This -- database file is usually stored in the file /etc/services. -data ServiceEntry = +data ServiceEntry = ServiceEntry { serviceName :: ServiceName, -- Official Name serviceAliases :: [ServiceName], -- aliases @@ -187,7 +184,7 @@ $ (trySysCall (c_getservbyname cstr_name cstr_proto)) >>= peek -foreign import CALLCONV unsafe "getservbyname" +foreign import CALLCONV unsafe "getservbyname" c_getservbyname :: CString -> CString -> IO (Ptr ServiceEntry) -- | Get the service given a 'PortNumber' and 'ProtocolName'. @@ -198,7 +195,7 @@ $ (trySysCall (c_getservbyport (fromIntegral port) cstr_proto)) >>= peek -foreign import CALLCONV unsafe "getservbyport" +foreign import CALLCONV unsafe "getservbyport" c_getservbyport :: CInt -> CString -> IO (Ptr ServiceEntry) -- | Get the 'PortNumber' corresponding to the 'ServiceName'. @@ -242,9 +239,9 @@ -- As for setServiceEntry above, calling setProtocolEntry. -- determines whether or not the protocol database file, usually -- @/etc/protocols@, is to be kept open between calls of --- getProtocolEntry. Similarly, +-- getProtocolEntry. Similarly, -data ProtocolEntry = +data ProtocolEntry = ProtocolEntry { protoName :: ProtocolName, -- Official Name protoAliases :: [ProtocolName], -- aliases @@ -264,12 +261,12 @@ -- With WinSock, the protocol number is only a short; -- hoist it in as such, but represent it on the Haskell side -- as a CInt. - p_proto_short <- (#peek struct protoent, p_proto) p + p_proto_short <- (#peek struct protoent, p_proto) p let p_proto = fromIntegral (p_proto_short :: CShort) #else - p_proto <- (#peek struct protoent, p_proto) p + p_proto <- (#peek struct protoent, p_proto) p #endif - return (ProtocolEntry { + return (ProtocolEntry { protoName = p_name, protoAliases = p_aliases, protoNumber = p_proto @@ -284,7 +281,7 @@ $ (trySysCall.c_getprotobyname) name_cstr >>= peek -foreign import CALLCONV unsafe "getprotobyname" +foreign import CALLCONV unsafe "getprotobyname" c_getprotobyname :: CString -> IO (Ptr ProtocolEntry) @@ -331,7 +328,7 @@ -- --------------------------------------------------------------------------- -- Host lookups -data HostEntry = +data HostEntry = HostEntry { hostName :: HostName, -- Official Name hostAliases :: [HostName], -- aliases @@ -385,7 +382,7 @@ $ trySysCall $ c_gethostbyname name_cstr peek ent -foreign import CALLCONV safe "gethostbyname" +foreign import CALLCONV safe "gethostbyname" c_gethostbyname :: CString -> IO (Ptr HostEntry) @@ -460,7 +457,7 @@ return (NetworkEntry { networkName = n_name, networkAliases = n_aliases, - networkFamily = unpackFamily (fromIntegral + networkFamily = unpackFamily (fromIntegral (n_addrtype :: CInt)), networkAddress = n_net }) @@ -476,7 +473,7 @@ $ trySysCall $ c_getnetbyname name_cstr >>= peek -foreign import ccall unsafe "getnetbyname" +foreign import ccall unsafe "getnetbyname" c_getnetbyname :: CString -> IO (Ptr NetworkEntry) getNetworkByAddr :: NetworkAddr -> Family -> IO NetworkEntry @@ -485,7 +482,7 @@ $ trySysCall $ c_getnetbyaddr addr (packFamily family) >>= peek -foreign import ccall unsafe "getnetbyaddr" +foreign import ccall unsafe "getnetbyaddr" c_getnetbyaddr :: NetworkAddr -> CInt -> IO (Ptr NetworkEntry) getNetworkEntry :: IO NetworkEntry @@ -539,7 +536,7 @@ throwSocketErrorIfMinus1_ "getHostName" $ c_gethostname cstr (fromIntegral size) peekCString cstr -foreign import CALLCONV unsafe "gethostname" +foreign import CALLCONV unsafe "gethostname" c_gethostname :: CString -> CSize -> IO CInt -- Helper function used by the exported functions that provides a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/Socket/ByteString/IOVec.hsc new/network-2.4.2.3/Network/Socket/ByteString/IOVec.hsc --- old/network-2.4.1.2/Network/Socket/ByteString/IOVec.hsc 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/Socket/ByteString/IOVec.hsc 2014-04-18 09:16:03.000000000 +0200 @@ -9,6 +9,7 @@ import Foreign.Ptr (Ptr) import Foreign.Storable (Storable(..)) +#include <sys/types.h> #include <sys/uio.h> data IOVec = IOVec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/Socket/ByteString.hsc new/network-2.4.2.3/Network/Socket/ByteString.hsc --- old/network-2.4.1.2/Network/Socket/ByteString.hsc 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/Socket/ByteString.hsc 2014-04-18 09:16:03.000000000 +0200 @@ -23,7 +23,7 @@ -- > import Network.Socket.ByteString -- module Network.Socket.ByteString - ( + ( -- * Send data to a socket send , sendAll diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/Socket/Types.hsc new/network-2.4.2.3/Network/Socket/Types.hsc --- old/network-2.4.1.2/Network/Socket/Types.hsc 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/Socket/Types.hsc 2014-04-18 09:16:03.000000000 +0200 @@ -1,6 +1,9 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE ForeignFunctionInterface #-} + +#include "HsNet.h" + module Network.Socket.Types ( -- * Socket @@ -50,8 +53,6 @@ , zeroMemory ) where -#include "HsNet.h" - import Control.Concurrent.MVar import Control.Monad import Data.Bits @@ -89,14 +90,19 @@ type ProtocolNumber = CInt +-- | The status of the socket as /determined by this library/, not +-- necessarily reflecting the state of the connection itself. +-- +-- For example, the 'Closed' status is applied when the 'close' +-- function is called. data SocketStatus -- Returned Status Function called - = NotConnected -- socket - | Bound -- bind - | Listening -- listen - | Connected -- connect/accept - | ConvertedToHandle -- is now a Handle, don't touch - | Closed -- close + = NotConnected -- ^ Newly created, unconnected socket + | Bound -- ^ Bound, via 'bind' + | Listening -- ^ Listening, via 'listen' + | Connected -- ^ Connected or accepted, via 'connect' or 'accept' + | ConvertedToHandle -- ^ Is now a 'Handle' (via 'socketToHandle'), don't touch + | Closed -- ^ Closed was closed by 'close' deriving (Eq, Show, Typeable) ----------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/Socket.hsc new/network-2.4.2.3/Network/Socket.hsc --- old/network-2.4.1.2/Network/Socket.hsc 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/Socket.hsc 2014-04-18 09:16:03.000000000 +0200 @@ -22,9 +22,6 @@ #include "HsNet.h" --- NOTE: ##, we want this interpreted when compiling the .hs, not by hsc2hs. -##include "Typeable.h" - -- In order to process this file, you need to have CALLCONV defined. module Network.Socket @@ -82,9 +79,12 @@ , getPeerName , getSocketName -#ifdef HAVE_STRUCT_UCRED +#if defined(HAVE_STRUCT_UCRED) || defined(HAVE_GETPEEREID) -- get the credentials of our domain socket peer. , getPeerCred +#if defined(HAVE_GETPEEREID) + , getPeerEid +#endif #endif , socketPort @@ -179,7 +179,7 @@ import Foreign.Ptr (Ptr, castPtr, nullPtr) import Foreign.Storable (Storable(..)) import Foreign.C.Error -import Foreign.C.String (CString, withCString, peekCString, peekCStringLen) +import Foreign.C.String (CString, withCString, withCStringLen, peekCString, peekCStringLen) import Foreign.C.Types (CUInt, CChar) #if __GLASGOW_HASKELL__ >= 703 import Foreign.C.Types (CInt(..), CSize(..)) @@ -510,17 +510,16 @@ return new_sock #else with (fromIntegral sz) $ \ ptr_len -> do - new_sock <- # ifdef HAVE_ACCEPT4 - throwSocketErrorIfMinus1RetryMayBlock "accept" + new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept" (threadWaitRead (fromIntegral s)) (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK)) # else - throwSocketErrorWaitRead sock "accept" + new_sock <- throwSocketErrorWaitRead sock "accept" (c_accept s sockaddr ptr_len) + setNonBlockIfNeeded new_sock # endif /* HAVE_ACCEPT4 */ #endif - setNonBlockIfNeeded new_sock addr <- peekSockAddr sockaddr new_status <- newMVar Connected return ((MkSocket new_sock family stype protocol new_status), addr) @@ -562,8 +561,8 @@ -> SockAddr -> IO Int -- Number of Bytes sent sendTo sock xs addr = do - withCString xs $ \str -> do - sendBufTo sock str (length xs) addr + withCStringLen xs $ \(str, len) -> do + sendBufTo sock str len addr -- | Send data to the socket. The recipient can be specified -- explicitly, so the socket need not be in a connected state. @@ -638,8 +637,7 @@ -> String -- Data to send -> IO Int -- Number of Bytes sent send sock@(MkSocket s _family _stype _protocol _status) xs = do - let len = length xs - withCString xs $ \str -> do + withCStringLen xs $ \(str, len) -> do liftM fromIntegral $ #if defined(mingw32_HOST_OS) # if __GLASGOW_HASKELL__ >= 611 @@ -922,12 +920,12 @@ Just UseLoopBack -> Just ((#const SOL_SOCKET), (#const SO_USELOOPBACK)) #endif #endif // SOL_SOCKET -#ifdef IPPROTO_IP +#if HAVE_DECL_IPPROTO_IP #ifdef IP_TTL Just TimeToLive -> Just ((#const IPPROTO_IP), (#const IP_TTL)) #endif -#endif // IPPROTO_IP -#ifdef IPPROTO_TCP +#endif // HAVE_DECL_IPPROTO_IP +#if HAVE_DECL_IPPROTO_TCP #ifdef TCP_MAXSEG Just MaxSegment -> Just ((#const IPPROTO_TCP), (#const TCP_MAXSEG)) #endif @@ -937,12 +935,12 @@ #ifdef TCP_CORK Just Cork -> Just ((#const IPPROTO_TCP), (#const TCP_CORK)) #endif -#endif // IPPROTO_TCP -#ifdef IPPROTO_IPV6 +#endif // HAVE_DECL_IPPROTO_TCP +#if HAVE_DECL_IPPROTO_IPV6 #if HAVE_DECL_IPV6_V6ONLY Just IPv6Only -> Just ((#const IPPROTO_IPV6), (#const IPV6_V6ONLY)) #endif -#endif // IPPROTO_IPV6 +#endif // HAVE_DECL_IPPROTO_IPV6 _ -> Nothing -- | Return the option level and option value if they exist, @@ -983,12 +981,15 @@ fromIntegral `liftM` peek ptr_v -#ifdef HAVE_STRUCT_UCRED +#if defined(HAVE_STRUCT_UCRED) || defined(HAVE_GETPEEREID) -- | Returns the processID, userID and groupID of the socket's peer. -- --- Only available on platforms that support SO_PEERCRED on domain sockets. +-- Only available on platforms that support SO_PEERCRED or GETPEEREID(3) +-- on domain sockets. +-- GETPEEREID(3) returns userID and groupID. processID is always 0. getPeerCred :: Socket -> IO (CUInt, CUInt, CUInt) getPeerCred sock = do +#ifdef HAVE_STRUCT_UCRED let fd = fdSocket sock let sz = (fromIntegral (#const sizeof(struct ucred))) with sz $ \ ptr_cr -> @@ -1000,6 +1001,25 @@ uid <- (#peek struct ucred, uid) ptr_cr gid <- (#peek struct ucred, gid) ptr_cr return (pid, uid, gid) +#else + (uid,gid) <- getPeerEid sock + return (0,uid,gid) +#endif + +#ifdef HAVE_GETPEEREID +-- | The getpeereid() function returns the effective user and group IDs of the +-- peer connected to a UNIX-domain socket +getPeerEid :: Socket -> IO (CUInt, CUInt) +getPeerEid sock = do + let fd = fdSocket sock + alloca $ \ ptr_uid -> + alloca $ \ ptr_gid -> do + throwSocketErrorIfMinus1Retry "getPeerEid" $ + c_getpeereid fd ptr_uid ptr_gid + uid <- peek ptr_uid + gid <- peek ptr_gid + return (uid, gid) +#endif #endif ##if !(MIN_VERSION_base(4,3,1)) @@ -1105,6 +1125,10 @@ -- ----------------------------------------------------------------------------- +-- | Determines whether 'close' has been used on the 'Socket'. This +-- does /not/ indicate any status about the socket beyond this. If the +-- socket has been closed remotely, this function can still return +-- 'True'. isConnected :: Socket -> IO Bool isConnected (MkSocket _ _ _ _ status) = do value <- readMVar status @@ -1634,6 +1658,10 @@ foreign import CALLCONV unsafe "setsockopt" c_setsockopt :: CInt -> CInt -> CInt -> Ptr CInt -> CInt -> IO CInt +#if defined(HAVE_GETPEEREID) +foreign import CALLCONV unsafe "getpeereid" + c_getpeereid :: CInt -> Ptr CUInt -> Ptr CUInt -> IO CInt +#endif -- --------------------------------------------------------------------------- -- * Deprecated aliases diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network/URI.hs new/network-2.4.2.3/Network/URI.hs --- old/network-2.4.1.2/Network/URI.hs 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network/URI.hs 2014-04-18 09:16:03.000000000 +0200 @@ -64,13 +64,13 @@ URI(..) , URIAuth(..) , nullURI - + -- * Parsing , parseURI , parseURIReference , parseRelativeReference , parseAbsoluteURI - + -- * Test for strings containing various kinds of URI , isURI , isURIReference @@ -78,16 +78,16 @@ , isAbsoluteURI , isIPv6address , isIPv4address - + -- * Predicates , uriIsAbsolute , uriIsRelative - + -- * Relative URIs , relativeTo , nonStrictRelativeTo , relativeFrom - + -- * Operations on URI strings -- | Support for putting strings into URI-friendly -- escaped format and getting them back again. @@ -103,12 +103,12 @@ , escapeURIChar , escapeURIString , unEscapeString - + -- * URI Normalization functions , normalizeCase , normalizeEscape , normalizePathSegments - + -- * Deprecated functions , parseabsoluteURI , escapeString diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/Network.hs new/network-2.4.2.3/Network.hs --- old/network-2.4.1.2/Network.hs 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/Network.hs 2014-04-18 09:16:03.000000000 +0200 @@ -4,7 +4,7 @@ -- Module : Network -- Copyright : (c) The University of Glasgow 2001 -- License : BSD-style (see the file libraries/network/LICENSE) --- +-- -- Maintainer : libraries(a)haskell.org -- Stability : provisional -- Portability : portable @@ -32,7 +32,7 @@ -- * Initialisation , withSocketsDo - + -- * Server-side connections , listenOn , accept @@ -63,7 +63,8 @@ import Control.Monad (liftM) import Data.Maybe (fromJust) import Network.BSD -import Network.Socket hiding (accept, socketPort, recvFrom, sendTo, PortNumber) +import Network.Socket hiding (accept, socketPort, recvFrom, + sendTo, PortNumber, sClose) import qualified Network.Socket as Socket (accept) import System.IO import Prelude @@ -77,7 +78,7 @@ -- raised. Alternatively an empty string may be given to @connectTo@ -- signalling that the current hostname applies. -data PortID = +data PortID = Service String -- Service Name eg "ftp" | PortNumber PortNumber -- User defined Port Number #if !defined(mingw32_HOST_OS) && !defined(cygwin32_HOST_OS) && !defined(_WIN32) @@ -88,7 +89,7 @@ -- | Calling 'connectTo' creates a client side socket which is -- connected to the given host and port. The Protocol and socket type is -- derived from the given port identifier. If a port number is given --- then the result is always an internet family 'Stream' socket. +-- then the result is always an internet family 'Stream' socket. connectTo :: HostName -- Hostname -> PortID -- Port Identifier @@ -267,14 +268,14 @@ accept :: Socket -- ^ Listening Socket -> IO (Handle, HostName, - PortNumber) -- ^ Triple of: read\/write 'Handle' for + PortNumber) -- ^ Triple of: read\/write 'Handle' for -- communicating with the client, -- the 'HostName' of the peer socket, and -- the 'PortNumber' of the remote connection. accept sock@(MkSocket _ AF_INET _ _ _) = do ~(sock', (SockAddrInet port haddr)) <- Socket.accept sock peer <- catchIO - (do + (do (HostEntry peer _ _ _) <- getHostByAddr AF_INET haddr return peer ) @@ -308,6 +309,13 @@ accept (MkSocket _ family _ _ _) = error $ "Sorry, address family " ++ (show family) ++ " is not supported!" + +-- | Close the socket. All future operations on the socket object will fail. +-- The remote end will receive no more data (after queued data is flushed). +sClose :: Socket -> IO () +sClose = close -- Explicit redefinition because Network.sClose is deperecated, + -- hence the re-export would also be marked as such. + -- ----------------------------------------------------------------------------- -- sendTo/recvFrom @@ -361,7 +369,7 @@ ip <- getHostByName host let ipHs = hostAddresses ip s <- listenOn port - let + let waiting = do ~(s', SockAddrInet _ haddr) <- Socket.accept s he <- getHostByAddr AF_INET haddr @@ -400,7 +408,7 @@ -- --------------------------------------------------------------------------- -- Utils --- Like bracket, but only performs the final action if there was an +-- Like bracket, but only performs the final action if there was an -- exception raised by the middle bit. bracketOnError :: IO a -- ^ computation to run first (\"acquire resource\") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/configure.ac new/network-2.4.2.3/configure.ac --- old/network-2.4.1.2/configure.ac 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/configure.ac 2014-04-18 09:16:03.000000000 +0200 @@ -17,9 +17,6 @@ # include <ws2tcpip.h> // fix for MingW not defining IPV6_V6ONLY # define IPV6_V6ONLY 27 -#endif -#ifdef HAVE_WSPIAPI_H -# include <wspiapi.h> #endif" # Safety check: Ensure that we are in the correct source directory. @@ -37,7 +34,7 @@ AC_C_CONST dnl ** check for specific header (.h) files that we are interested in -AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h sys/types.h unistd.h winsock2.h ws2tcpip.h wspiapi.h]) +AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h sys/types.h unistd.h winsock2.h ws2tcpip.h]) AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h netinet/tcp.h sys/socket.h sys/uio.h sys/un.h]) AC_CHECK_FUNCS([readlink symlink]) @@ -103,6 +100,12 @@ fi dnl -------------------------------------------------- +dnl * test for GETPEEREID(3) +dnl -------------------------------------------------- +AC_MSG_CHECKING(for getpeereid in unistd.h) +AC_CHECK_FUNC( getpeereid, AC_DEFINE([HAVE_GETPEEREID], [1], [Define to 1 if you have getpeereid.] )) + +dnl -------------------------------------------------- dnl * check for Windows networking libraries dnl -------------------------------------------------- AC_CHECK_LIB(ws2_32, _head_libws2_32_a) @@ -140,6 +143,11 @@ dnl ------------------------------------------------------- AC_CHECK_DECLS([IPV6_V6ONLY]) +dnl ------------------------------------------------------- +dnl * test for IPPROTO_* macros/constants +dnl ------------------------------------------------------- +AC_CHECK_DECLS([IPPROTO_IP, IPPROTO_TCP, IPPROTO_IPV6]) + dnl -------------------------------------------------- dnl * test for Linux sendfile(2) dnl -------------------------------------------------- @@ -161,7 +169,7 @@ AC_CHECK_FUNCS(accept4) case "$host" in -*-mingw32) +*-mingw*) EXTRA_SRCS="cbits/initWinSock.c, cbits/winSockErr.c, cbits/asyncAccept.c" EXTRA_LIBS=ws2_32 CALLCONV=stdcall ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/include/HsNet.h new/network-2.4.2.3/include/HsNet.h --- old/network-2.4.1.2/include/HsNet.h 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/include/HsNet.h 2014-04-18 09:16:03.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef INLINE # if defined(_MSC_VER) # define INLINE extern __inline -# elif defined(__GNUC__) +# elif defined(__GNUC_GNU_INLINE__) # define INLINE extern inline # else # define INLINE inline @@ -43,9 +43,6 @@ // fix for MingW not defining IPV6_V6ONLY # define IPV6_V6ONLY 27 # endif -# ifdef HAVE_WSPIAPI_H -# include <wspiapi.h> -# endif extern void shutdownWinSock(); extern int initWinSock (); @@ -176,4 +173,8 @@ # define IOV_MAX 1024 #endif +#if !defined(SOCK_NONBLOCK) // Missing define in Bionic libc (Android) +# define SOCK_NONBLOCK O_NONBLOCK +#endif + #endif /* HSNET_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/include/HsNetworkConfig.h new/network-2.4.2.3/include/HsNetworkConfig.h --- old/network-2.4.1.2/include/HsNetworkConfig.h 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/include/HsNetworkConfig.h 2014-04-18 09:16:03.000000000 +0200 @@ -26,6 +26,18 @@ don't. */ #define HAVE_DECL_AI_V4MAPPED 1 +/* Define to 1 if you have the declaration of `IPPROTO_IP', and to 0 if you + don't. */ +#define HAVE_DECL_IPPROTO_IP 1 + +/* Define to 1 if you have the declaration of `IPPROTO_IPV6', and to 0 if you + don't. */ +#define HAVE_DECL_IPPROTO_IPV6 1 + +/* Define to 1 if you have the declaration of `IPPROTO_TCP', and to 0 if you + don't. */ +#define HAVE_DECL_IPPROTO_TCP 1 + /* Define to 1 if you have the declaration of `IPV6_V6ONLY', and to 0 if you don't. */ #define HAVE_DECL_IPV6_V6ONLY 1 @@ -42,6 +54,9 @@ /* Define to 1 if you have the `gethostent' function. */ #define HAVE_GETHOSTENT 1 +/* Define to 1 if you have getpeereid. */ +#define HAVE_GETPEEREID 1 + /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 @@ -123,9 +138,6 @@ /* Define to 1 if you have the <ws2tcpip.h> header file. */ /* #undef HAVE_WS2TCPIP_H */ -/* Define to 1 if you have the <wspiapi.h> header file. */ -/* #undef HAVE_WSPIAPI_H */ - /* Define to 1 if the `getaddrinfo' function needs WINVER set. */ /* #undef NEED_WINVER_XP */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/include/HsNetworkConfig.h.in new/network-2.4.2.3/include/HsNetworkConfig.h.in --- old/network-2.4.1.2/include/HsNetworkConfig.h.in 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/include/HsNetworkConfig.h.in 2014-04-18 09:16:03.000000000 +0200 @@ -25,6 +25,18 @@ don't. */ #undef HAVE_DECL_AI_V4MAPPED +/* Define to 1 if you have the declaration of `IPPROTO_IP', and to 0 if you + don't. */ +#undef HAVE_DECL_IPPROTO_IP + +/* Define to 1 if you have the declaration of `IPPROTO_IPV6', and to 0 if you + don't. */ +#undef HAVE_DECL_IPPROTO_IPV6 + +/* Define to 1 if you have the declaration of `IPPROTO_TCP', and to 0 if you + don't. */ +#undef HAVE_DECL_IPPROTO_TCP + /* Define to 1 if you have the declaration of `IPV6_V6ONLY', and to 0 if you don't. */ #undef HAVE_DECL_IPV6_V6ONLY @@ -41,6 +53,9 @@ /* Define to 1 if you have the `gethostent' function. */ #undef HAVE_GETHOSTENT +/* Define to 1 if you have getpeereid. */ +#undef HAVE_GETPEEREID + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -122,9 +137,6 @@ /* Define to 1 if you have the <ws2tcpip.h> header file. */ #undef HAVE_WS2TCPIP_H -/* Define to 1 if you have the <wspiapi.h> header file. */ -#undef HAVE_WSPIAPI_H - /* Define to 1 if the `getaddrinfo' function needs WINVER set. */ #undef NEED_WINVER_XP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/network.buildinfo.in new/network-2.4.2.3/network.buildinfo.in --- old/network-2.4.1.2/network.buildinfo.in 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/network.buildinfo.in 2014-04-18 09:16:03.000000000 +0200 @@ -1,5 +1,6 @@ ghc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@ ghc-prof-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@ +ld-options: @LDFLAGS@ cc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@ c-sources: @EXTRA_SRCS@ extra-libraries: @EXTRA_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/network.cabal new/network-2.4.2.3/network.cabal --- old/network-2.4.1.2/network.cabal 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/network.cabal 2014-04-18 09:16:03.000000000 +0200 @@ -1,5 +1,5 @@ name: network -version: 2.4.1.2 +version: 2.4.2.3 license: BSD3 license-file: LICENSE maintainer: Johan Tibell <johan.tibell(a)gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/network-2.4.1.2/tests/Simple.hs new/network-2.4.2.3/tests/Simple.hs --- old/network-2.4.1.2/tests/Simple.hs 2013-02-22 01:03:06.000000000 +0100 +++ new/network-2.4.2.3/tests/Simple.hs 2014-04-18 09:16:03.000000000 +0200 @@ -112,6 +112,67 @@ client sock = send sock testMsg +{- +testGetPeerCred:: Assertion +testGetPeerCred = + test clientSetup clientAct serverSetup server + where + clientSetup = do + sock <- socket AF_UNIX Stream defaultProtocol + connect sock $ SockAddrUnix addr + return sock + + serverSetup = do + sock <- socket AF_UNIX Stream defaultProtocol + bindSocket sock $ SockAddrUnix addr + listen sock 1 + return sock + + server sock = do + (clientSock, _) <- accept sock + serverAct clientSock + sClose clientSock + + addr = "/tmp/testAddr1" + clientAct sock = withSocketsDo $ do + sendAll sock testMsg + (pid,uid,gid) <- getPeerCred sock + putStrLn $ unwords ["pid=",show pid,"uid=",show uid, "gid=", show gid] + serverAct sock = withSocketsDo $ do + msg <- recv sock 1024 + putStrLn $ C.unpack msg + + +testGetPeerEid :: Assertion +testGetPeerEid = + test clientSetup clientAct serverSetup server + where + clientSetup = do + sock <- socket AF_UNIX Stream defaultProtocol + connect sock $ SockAddrUnix addr + return sock + + serverSetup = do + sock <- socket AF_UNIX Stream defaultProtocol + bindSocket sock $ SockAddrUnix addr + listen sock 1 + return sock + + server sock = do + (clientSock, _) <- accept sock + serverAct clientSock + sClose clientSock + + addr = "/tmp/testAddr2" + clientAct sock = withSocketsDo $ do + sendAll sock testMsg + (uid,gid) <- getPeerEid sock + putStrLn $ unwords ["uid=",show uid, "gid=", show gid] + serverAct sock = withSocketsDo $ do + msg <- recv sock 1024 + putStrLn $ C.unpack msg +-} + ------------------------------------------------------------------------ -- Other @@ -132,6 +193,8 @@ , testCase "testOverFlowRecv" testOverFlowRecv , testCase "testRecvFrom" testRecvFrom , testCase "testOverFlowRecvFrom" testOverFlowRecvFrom +-- , testCase "testGetPeerCred" testGetPeerCred +-- , testCase "testGetPeerEid" testGetPeerEid ] tests :: [Test] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-mtl for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

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(a)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(a)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_na… +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(a)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(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-HUnit for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-HUnit for openSUSE:Factory checked in at 2014-11-26 20:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HUnit (Old) and /work/SRC/openSUSE:Factory/.ghc-HUnit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HUnit" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HUnit/ghc-HUnit.changes 2014-08-25 11:05:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HUnit.new/ghc-HUnit.changes 2014-11-26 20:54:53.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Sep 2 08:22:40 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HUnit.spec ++++++ --- /var/tmp/diff_new_pack.JVffdX/_old 2014-11-26 20:54:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JVffdX/_new 2014-11-26 20:54:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-HUnit # -# 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 @@ -16,45 +16,42 @@ # -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - %global pkg_name HUnit -%global common_summary A unit testing framework for Haskell - -%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool for Java, see: http://www.junit.org. - Name: ghc-HUnit Version: 1.2.5.2 Release: 0 -Summary: %{common_summary} +Summary: A unit testing framework for Haskell 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_na… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-deepseq-devel BuildRequires: ghc-rpm-macros -# END cabal2spec +# Begin cabal-rpm deps: +BuildRequires: ghc-deepseq-devel +# End cabal-rpm deps %description -%{common_description} +HUnit is a unit testing framework for Haskell, inspired by the JUnit tool for +Java, see: <http://www.junit.org>. + %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} @@ -64,6 +61,7 @@ %install %ghc_lib_install +rm -rf %{buildroot}%{_datadir}/%{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -74,9 +72,9 @@ %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/%{pkg_name}-%{version} %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc examples README doc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-HTTP for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-HTTP for openSUSE:Factory checked in at 2014-11-26 20:54:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HTTP (Old) and /work/SRC/openSUSE:Factory/.ghc-HTTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HTTP" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HTTP/ghc-HTTP.changes 2014-08-25 11:05:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HTTP.new/ghc-HTTP.changes 2014-11-26 20:54:52.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Sep 9 20:09:24 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 4000.2.10 +* no changelog +* for Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Mon Sep 1 17:20:24 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file with cabal-rpm 0.8.6 +* require exact version of ghc-compiler + +------------------------------------------------------------------- Old: ---- HTTP-4000.2.8.tar.gz New: ---- HTTP-4000.2.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HTTP.spec ++++++ --- /var/tmp/diff_new_pack.IQjvUQ/_old 2014-11-26 20:54:52.000000000 +0100 +++ /var/tmp/diff_new_pack.IQjvUQ/_new 2014-11-26 20:54:52.000000000 +0100 @@ -1,8 +1,7 @@ # # spec file for package ghc-HTTP # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2013 Peter Trommler peter.trommler(a)ohm-hochschule.de +# 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 @@ -19,45 +18,59 @@ %global pkg_name HTTP -%global common_summary Haskell library for client-side HTTP - -%global common_description The HTTP package supports client-side web programming in Haskell. It lets you set up HTTP connections, transmitting requests and processing the responses coming back, all from within the comforts of Haskell. It is dependent on the network package to operate, but other than that, the implementation is all written in Haskell. - Name: ghc-HTTP -Version: 4000.2.8 +Version: 4000.2.10 Release: 0 -Summary: %{common_summary} +Summary: A library for client-side HTTP 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_na… -BuildRequires: %{!?without_hscolour:hscolour} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-array-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-parsec-devel -BuildRequires: ghc-rpm-macros -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +The HTTP package supports client-side web programming in Haskell. It lets you +set up HTTP connections, transmitting requests and processing the responses +coming back, all from within the comforts of Haskell. It's dependent on the +network package to operate, but other than that, the implementation is all +written in Haskell. + +A basic API for issuing single HTTP requests + receiving responses is provided. +On top of that, a session-level abstraction is also on offer (the +BrowserAction monad); it taking care of handling the management of persistent +connections, proxies, state (cookies) and authentication credentials required +to handle multi-step interactions with a web server. + +The representation of the bytes flowing across is extensible via the use of a +type class, letting you pick the representation of requests and responses that +best fits your use. Some pre-packaged, common instances are provided for you +(ByteString, String.) +# ' Help EMACS syntax highlighting %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} ++++++ HTTP-4000.2.8.tar.gz -> HTTP-4000.2.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.8/HTTP.cabal new/HTTP-4000.2.10/HTTP.cabal --- old/HTTP-4000.2.8/HTTP.cabal 2013-02-10 22:51:15.000000000 +0100 +++ new/HTTP-4000.2.10/HTTP.cabal 2013-12-09 21:07:19.000000000 +0100 @@ -1,5 +1,5 @@ Name: HTTP -Version: 4000.2.8 +Version: 4000.2.10 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3 @@ -85,7 +85,7 @@ Network.HTTP.Utils Paths_HTTP GHC-options: -fwarn-missing-signatures -Wall - Build-depends: base >= 2 && < 4.7, network < 2.5, parsec + Build-depends: base >= 2 && < 4.8, network < 2.5, parsec Extensions: FlexibleInstances if flag(old-base) Build-depends: base < 3 @@ -107,7 +107,7 @@ Test-Suite test type: exitcode-stdio-1.0 - build-tools: ghc >= 6.10 && < 7.8 + build-tools: ghc >= 6.10 && < 7.10 hs-source-dirs: test main-is: httpTests.hs @@ -118,14 +118,15 @@ httpd-shed, mtl >= 2.0 && < 2.2, bytestring >= 0.9 && < 0.11, - case-insensitive >= 0.4 && < 0.5, + case-insensitive >= 0.4 && < 1.2, deepseq >= 1.3 && < 1.4, - http-types >= 0.6 && < 0.8, - conduit >= 0.4 && < 0.6, + http-types >= 0.6 && < 0.9, + conduit >= 0.4 && < 1.1, wai >= 1.2 && < 1.4, - warp >= 1.2 && < 1.4, + -- compile failure with warp 1.3.10 + warp >= 1.2 && < 1.3.10, pureMD5 >= 2.1 && < 2.2, - base >= 2 && < 4.7, + base >= 2 && < 4.8, network, split >= 0.1 && < 0.3, test-framework, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.8/Network/HTTP/Base.hs new/HTTP-4000.2.10/Network/HTTP/Base.hs --- old/HTTP-4000.2.8/Network/HTTP/Base.hs 2013-02-10 22:51:15.000000000 +0100 +++ new/HTTP-4000.2.10/Network/HTTP/Base.hs 2013-12-09 21:07:19.000000000 +0100 @@ -868,7 +868,7 @@ = readL >>= either (\v -> return $ Left v) (\more -> if (buf_isEmpty bufOps more) - then return (Right ([],foldr (flip (buf_append bufOps)) (buf_empty bufOps) strs)) + then return (Right ([], buf_concat bufOps $ reverse strs)) else hopefulTransfer bufOps readL (more:strs)) -- | A necessary feature of HTTP\/1.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-html for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-html for openSUSE:Factory checked in at 2014-11-26 20:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-html (Old) and /work/SRC/openSUSE:Factory/.ghc-html.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-html" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-html/ghc-html.changes 2014-08-25 11:05:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-html.new/ghc-html.changes 2014-11-26 20:54:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Sep 2 09:01:50 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-html.spec ++++++ --- /var/tmp/diff_new_pack.wAWQdr/_old 2014-11-26 20:54:51.000000000 +0100 +++ /var/tmp/diff_new_pack.wAWQdr/_new 2014-11-26 20:54:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-html # -# 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,39 +18,36 @@ %global pkg_name html -%global common_summary Haskell HTML combinator library - -%global common_description This package contains a Haskell combinator library for constructing HTML documents. - Name: ghc-html Version: 1.0.1.2 Release: 0 -Summary: %{common_summary} +Summary: HTML combinator library 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_na… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# END cabal2spec %description -%{common_description} +This package contains a combinator library for constructing HTML documents. + %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} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-haskell-src for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '14

26 Nov '14

Hello community, here is the log from the commit of package ghc-haskell-src for openSUSE:Factory checked in at 2014-11-26 20:54:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-haskell-src (Old) and /work/SRC/openSUSE:Factory/.ghc-haskell-src.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-haskell-src" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-haskell-src/ghc-haskell-src.changes 2014-08-25 11:05:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-haskell-src.new/ghc-haskell-src.changes 2014-11-26 20:54:49.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Sep 9 20:42:22 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- update to 1.0.1.6 +* no changelog +* Haskell Platform 2014.2.0.0 + +------------------------------------------------------------------- +Tue Sep 2 09:00:22 UTC 2014 - peter.trommler(a)ohm-hochschule.de + +- regenerated spec file + +------------------------------------------------------------------- Old: ---- haskell-src-1.0.1.5.tar.gz New: ---- haskell-src-1.0.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-haskell-src.spec ++++++ --- /var/tmp/diff_new_pack.ZLwxgi/_old 2014-11-26 20:54:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ZLwxgi/_new 2014-11-26 20:54:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-haskell-src # -# 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,43 +18,44 @@ %global pkg_name haskell-src -%global common_summary Support for manipulating Haskell source code - -%global common_description This package provides support for manipulating Haskell source code. The package provides a lexer, parser and pretty-printer, and a definition of a Haskell abstract syntax tree (AST). Common uses of this package are to parse or generate Haskell 98 code. - Name: ghc-haskell-src -Version: 1.0.1.5 +Version: 1.0.1.6 Release: 0 -Summary: %{common_summary} +Summary: Support for manipulating Haskell source code 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_na… -BuildRequires: %{!?without_hscolour:hscolour} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-pretty-devel -BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-devel -# END cabal2spec +# End cabal-rpm deps %description -%{common_description} +The 'haskell-src' package provides support for manipulating Haskell source +code. The package provides a lexer, parser and pretty-printer, and a definition +of a Haskell abstract syntax tree (AST). Common uses of this package are to +parse or generate Haskell 98 code. + %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} ++++++ haskell-src-1.0.1.5.tar.gz -> haskell-src-1.0.1.6.tar.gz ++++++ ++++ 4626 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0