From 5bf744e6af66259af7831fa6c684944188057c99bf082e2f6939943849cb6fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 16 Jul 2016 21:08:40 +0000 Subject: [PATCH] Accepting request 409159 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/409159 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson?expand=0&rev=16 --- 1.cabal | 190 ++++++++++++++++++++++++++++++++++++++++++++++ ghc-aeson.changes | 5 ++ ghc-aeson.spec | 62 +++++---------- 3 files changed, 216 insertions(+), 41 deletions(-) create mode 100644 1.cabal diff --git a/1.cabal b/1.cabal new file mode 100644 index 0000000..ed04c9f --- /dev/null +++ b/1.cabal @@ -0,0 +1,190 @@ +name: aeson +version: 0.11.2.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Text, Web, JSON +copyright: (c) 2011-2016 Bryan O'Sullivan + (c) 2011 MailRank, Inc. +author: Bryan O'Sullivan +maintainer: Bryan O'Sullivan +stability: experimental +tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2 +synopsis: Fast JSON parsing and encoding +cabal-version: >= 1.10 +homepage: https://github.com/bos/aeson +bug-reports: https://github.com/bos/aeson/issues +build-type: Simple +description: + A JSON parsing and encoding library optimized for ease of use + and high performance. + . + To get started, see the documentation for the @Data.Aeson@ module + below. + . + Parsing performance on a late 2013 MacBook Pro (2.6GHz Core i7), + running 64-bit GHC 7.10.1, for mostly-English tweets from Twitter's + JSON search API: + . + * 6.4 KB payloads, English: 7570 msg\/sec (47.6 MB\/sec) + . + * 14.6 KB payloads, Japanese: 3261 msg\/sec (46.6 MB\/sec) + . + Encoding performance on the same machine and data: + . + * 6.4 KB payloads, English: 22738 msg\/sec (142.9 MB\/sec) + . + * 14.6 KB payloads, Japanese: 15911 msg\/sec (227.4 MB\/sec) + . + (A note on naming: in Greek mythology, Aeson was the father of Jason.) + +extra-source-files: + README.markdown + benchmarks/*.cabal + benchmarks/*.hs + benchmarks/*.py + benchmarks/Compare/*.hs + benchmarks/Makefile + benchmarks/Typed/*.hs + benchmarks/json-data/*.json + include/overlapping-compat.h + changelog.md + examples/*.cabal + examples/*.hs + examples/Twitter/*.hs + include/*.h + +flag developer + description: operate in developer mode + default: False + manual: True + +flag old-locale + description: If false then depend on time >= 1.5. + . + If true then depend on time < 1.5 together with old-locale. + default: False + +library + default-language: Haskell2010 + + exposed-modules: + Data.Aeson + Data.Aeson.Encode + Data.Aeson.Internal + Data.Aeson.Internal.Time + Data.Aeson.Parser + Data.Aeson.Types + Data.Aeson.TH + + other-modules: + Data.Aeson.Encode.Builder + Data.Aeson.Encode.Functions + Data.Aeson.Functions + Data.Aeson.Parser.Internal + Data.Aeson.Parser.Time + Data.Aeson.Types.Class + Data.Aeson.Types.Generic + Data.Aeson.Types.Instances + Data.Aeson.Types.Internal + + build-depends: + attoparsec >= 0.13.0.1, + base >= 4.5 && < 5, + bytestring >= 0.10.4.0, + containers, + deepseq, + dlist >= 0.2, + fail == 4.9.*, + ghc-prim >= 0.2, + hashable >= 1.1.2.0, + mtl, + scientific >= 0.3.1 && < 0.4, + syb, + tagged >=0.8.3 && <0.9, + template-haskell >= 2.7, + text >= 1.1.1.0, + transformers, + unordered-containers >= 0.2.5.0, + vector >= 0.8 + + if !impl(ghc >= 8.0) + -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9 + build-depends: semigroups >= 0.16.1 && < 0.19 + + if !impl(ghc >= 7.10) + -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 + build-depends: nats >=1 && <1.2 + + if flag(old-locale) + build-depends: time < 1.5, old-locale + else + build-depends: time >= 1.5 + + if flag(developer) + ghc-prof-options: -auto-all + + ghc-options: -O2 -Wall + + include-dirs: include + +test-suite tests + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: tests + main-is: Tests.hs + other-modules: + DataFamilies.Properties + DataFamilies.Instances + DataFamilies.Encoders + DataFamilies.Types + Encoders + Functions + Instances + Options + Properties + Types + UnitTests + + ghc-options: -Wall -threaded -rtsopts + + build-depends: + HUnit, + QuickCheck >= 2.7 && <2.8.3, + aeson, + attoparsec, + base, + base-orphans >=0.5.3 && <0.6, + bytestring, + containers, + ghc-prim >= 0.2, + hashable >= 1.1.2.0, + tagged, + template-haskell, + test-framework, + test-framework-hunit, + test-framework-quickcheck2, + text, + time, + unordered-containers, + vector, + quickcheck-instances >=0.3.12 + + if !impl(ghc >= 8.0) + build-depends: semigroups >= 0.16.1 && < 0.19 + + if flag(old-locale) + build-depends: time < 1.5, old-locale + else + build-depends: time >= 1.5 + + if !impl(ghc >= 7.10) + build-depends: nats >=1 && <1.2 + +source-repository head + type: git + location: git://github.com/bos/aeson.git + +source-repository head + type: mercurial + location: https://bitbucket.org/bos/aeson diff --git a/ghc-aeson.changes b/ghc-aeson.changes index b0de972..5146280 100644 --- a/ghc-aeson.changes +++ b/ghc-aeson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:33:06 UTC 2016 - psimons@suse.com + +- Update to version 0.11.2.0 revision 1 with cabal2obs. + ------------------------------------------------------------------- Thu May 26 06:06:35 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a521749..acda607 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,22 +17,17 @@ %global pkg_name aeson - %bcond_with tests - Name: ghc-%{pkg_name} Version: 0.11.2.0 Release: 0 Summary: Fast JSON parsing and encoding License: BSD-3-Clause Group: System/Libraries - Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel @@ -42,6 +37,7 @@ BuildRequires: ghc-dlist-devel BuildRequires: ghc-fail-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel BuildRequires: ghc-semigroups-devel BuildRequires: ghc-syb-devel @@ -49,11 +45,15 @@ BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-orphans-devel +BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -66,71 +66,51 @@ performance. To get started, see the documentation for the 'Data.Aeson' module below. -Parsing performance on an early 2011 MacBook Pro (2.2GHz Core i7), running -64-bit GHC 7.6.3, for mostly-English tweets from Twitter's JSON search API: +Parsing performance on a late 2013 MacBook Pro (2.6GHz Core i7), running 64-bit +GHC 7.10.1, for mostly-English tweets from Twitter's JSON search API: -* 0.8 KB: 34124 msg/sec (27.8 MB/sec) +* 6.4 KB payloads, English: 7570 msg/sec (47.6 MB/sec) -* 6.4 KB: 6833 msg/sec (43.0 MB/sec) - -* 11.8 KB: 3410 msg/sec (39.2 MB/sec) - -* 31.2 KB: 1157 msg/sec (35.3 MB/sec) - -* 61.5 KB: 542 msg/sec (32.5 MB/sec) - -Handling heavily-escaped text is a little more work. Here is parsing -performance with Japanese tweets, where much of the text is entirely -Unicode-escaped. - -* 14.6 KB: 2101 msg/sec (30.0 MB/sec) - -* 44.1 KB: 667 msg/sec (28.7 MB/sec) - -* 82.9 KB: 360 msg/sec (29.2 MB/sec) +* 14.6 KB payloads, Japanese: 3261 msg/sec (46.6 MB/sec) Encoding performance on the same machine and data: -* English, 0.8 KB: 109697 msg/sec (89.3 MB/sec) +* 6.4 KB payloads, English: 22738 msg/sec (142.9 MB/sec) -* English, 6.4 KB: 18517 msg/sec (116.4 MB/sec) - -* Engish, 61.5 KB: 1963 msg/sec (118.0 MB/sec) - -* Japanese, 14.6 KB: 12140 msg/sec (173.5 MB/sec) - -* Japanese, 44.1 KB: 3980 msg/sec (171.3 MB/sec) +* 14.6 KB payloads, Japanese: 15911 msg/sec (227.4 MB/sec) (A note on naming: in Greek mythology, Aeson was the father of Jason.). - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{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 This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal + %build -%define cabal_configure_options -f"old-time" %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache @@ -143,6 +123,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.markdown examples +%doc README.markdown changelog.md examples %changelog