From be30f272dd01ed790b87a51226e5030db6769c8b7483ae659133ca6af2868667 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2017 17:38:47 +0000 Subject: [PATCH 1/2] synchronize with lts-8 package sett from configuration 0cb270c8d22a0823ab5130d95cc499e186cf864e OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=24 --- ghc-conduit-extra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index c5963fc..83964e8 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-conduit-extra # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From a4b82b3d1e7cc3268b4efb7275116f9c8eecdc438727aab82b21fa1a51869c8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Mar 2017 10:56:29 +0000 Subject: [PATCH 2/2] synchronize with lts:8 from configuration b099e9d7d96777a669f3ad2cb719ba73f50b4189 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=25 --- conduit-extra.cabal | 123 ++++++++++++++++++++++++++++++++++++++ ghc-conduit-extra.changes | 5 ++ ghc-conduit-extra.spec | 2 + 3 files changed, 130 insertions(+) create mode 100644 conduit-extra.cabal diff --git a/conduit-extra.cabal b/conduit-extra.cabal new file mode 100644 index 0000000..7fe739a --- /dev/null +++ b/conduit-extra.cabal @@ -0,0 +1,123 @@ +Name: conduit-extra +Version: 1.1.15 +x-revision: 1 +Synopsis: Batteries included conduit: adapters for common libraries. +Description: + The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit. +License: MIT +License-file: LICENSE +Author: Michael Snoyman +Maintainer: michael@snoyman.com +Category: Data, Conduit +Build-type: Simple +Cabal-version: >=1.8 +Homepage: http://github.com/snoyberg/conduit +extra-source-files: + test/random + test/filesystem/*.txt + test/filesystem/bin/*.txt + ChangeLog.md + README.md + +Library + Exposed-modules: Data.Conduit.Attoparsec + Data.Conduit.Binary + Data.Conduit.Blaze + Data.Conduit.ByteString.Builder + Data.Conduit.Filesystem + Data.Conduit.Lazy + Data.Conduit.Network + Data.Conduit.Network.UDP + Data.Conduit.Process + Data.Conduit.Text + Data.Conduit.Zlib + if !os(windows) + Exposed-modules: Data.Conduit.Network.Unix + + if arch(x86_64) || arch(i386) + -- These architectures are able to perform unaligned memory accesses + cpp-options: -DALLOW_UNALIGNED_ACCESS + + Build-depends: base >= 4.5 && < 5 + , conduit >= 1.1 && < 1.3 + + -- No version bounds necessary, since they're inherited + -- from conduit. + , bytestring + , exceptions >= 0.6 && < 0.9 + , monad-control + , text + , transformers + , transformers-base + + , async + , attoparsec >= 0.10 + , blaze-builder >= 0.3 + , directory + , filepath + , network >= 2.3 + , primitive >= 0.5 + , process + , resourcet >= 1.1 + , stm + , streaming-commons >= 0.1.16 + + ghc-options: -Wall + +test-suite test + hs-source-dirs: test + main-is: Spec.hs + type: exitcode-stdio-1.0 + ghc-options: -threaded + cpp-options: -DTEST + build-depends: conduit + , conduit-extra + , base + , hspec >= 1.3 + + , async + , attoparsec + , blaze-builder + , bytestring-builder + , bytestring + , exceptions + , process + , resourcet + , QuickCheck + , stm + , streaming-commons + , text + , transformers + , transformers-base + , directory + ghc-options: -Wall + if os(windows) + cpp-options: -DWINDOWS + other-modules: Data.Conduit.AttoparsecSpec + Data.Conduit.BinarySpec + Data.Conduit.ByteString.BuilderSpec + Data.Conduit.ExtraSpec + Data.Conduit.FilesystemSpec + Data.Conduit.LazySpec + Data.Conduit.NetworkSpec + Data.Conduit.ProcessSpec + Data.Conduit.TextSpec + Data.Conduit.ZlibSpec + +benchmark blaze + type: exitcode-stdio-1.0 + hs-source-dirs: bench + build-depends: base + , blaze-builder + , conduit + , conduit-extra + , criterion + , bytestring + , bytestring-builder + , transformers + main-is: blaze.hs + ghc-options: -Wall -O2 -rtsopts + +source-repository head + type: git + location: git://github.com/snoyberg/conduit.git diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 92a8fe6..e34e0f4 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 27 12:41:01 UTC 2017 - psimons@suse.com + +- Update to version 1.1.15 revision 1 with cabal2obs. + ------------------------------------------------------------------- Mon Nov 14 09:30:04 UTC 2016 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 83964e8..fbef3e5 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -26,6 +26,7 @@ License: MIT Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel @@ -73,6 +74,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build