diff --git a/.gitignore b/.gitignore index 570c43b..0bfe367 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /generics-sop-0.3.1.0.tar.gz /generics-sop-0.3.2.0.tar.gz +/generics-sop-0.4.0.1.tar.gz +/sop-core-0.4.0.0.tar.gz diff --git a/generics-sop-0.3.2.0.cabal b/generics-sop-0.3.2.0.cabal deleted file mode 100644 index 6ff64c3..0000000 --- a/generics-sop-0.3.2.0.cabal +++ /dev/null @@ -1,110 +0,0 @@ -name: generics-sop -version: 0.3.2.0 -x-revision: 3 -synopsis: Generic Programming using True Sums of Products -description: - A library to support the definition of generic functions. - Datatypes are viewed in a uniform, structured way: - the choice between constructors is represented using an n-ary - sum, and the arguments of each constructor are represented using - an n-ary product. - . - The module "Generics.SOP" is the main module of this library and contains - more detailed documentation. - . - Examples of using this library are provided by the following - packages: - . - * @@ basic examples, - . - * @@ generic pretty printing, - . - * @@ generically computed lenses, - . - * @@ generic JSON conversions. - . - A detailed description of the ideas behind this library is provided by - the paper: - . - * Edsko de Vries and Andres Löh. - . - Workshop on Generic Programming (WGP) 2014. - . -license: BSD3 -license-file: LICENSE -author: Edsko de Vries , Andres Löh -maintainer: andres@well-typed.com -category: Generics -build-type: Simple -cabal-version: >=1.10 -extra-source-files: CHANGELOG.md doctest.sh -tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1, GHC == 8.0.2, GHC == 8.2.1, GHC == 8.2.2, GHC == 8.3.* - -source-repository head - type: git - location: https://github.com/well-typed/generics-sop - -library - exposed-modules: Generics.SOP - Generics.SOP.GGP - Generics.SOP.TH - Generics.SOP.Dict - Generics.SOP.Type.Metadata - -- exposed via Generics.SOP: - Generics.SOP.BasicFunctors - Generics.SOP.Classes - Generics.SOP.Constraint - Generics.SOP.Instances - Generics.SOP.Metadata - Generics.SOP.NP - Generics.SOP.NS - Generics.SOP.Universe - Generics.SOP.Sing - build-depends: base >= 4.7 && < 5, - template-haskell >= 2.8 && < 2.15, - ghc-prim >= 0.3 && < 0.6, - deepseq >= 1.3 && < 1.5 - if !impl (ghc >= 8.0) - build-depends: transformers-compat >= 0.3 && < 0.7, - transformers >= 0.3 && < 0.6 - - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall - default-extensions: CPP - ScopedTypeVariables - TypeFamilies - RankNTypes - TypeOperators - GADTs - ConstraintKinds - MultiParamTypeClasses - TypeSynonymInstances - FlexibleInstances - FlexibleContexts - DeriveFunctor - DeriveFoldable - DeriveTraversable - DefaultSignatures - KindSignatures - DataKinds - FunctionalDependencies - AutoDeriveTypeable - other-extensions: OverloadedStrings - PolyKinds - UndecidableInstances - TemplateHaskell - DeriveGeneric - StandaloneDeriving - if impl (ghc < 7.10) - other-extensions: OverlappingInstances - -test-suite generics-sop-examples - type: exitcode-stdio-1.0 - main-is: Example.hs - other-modules: HTransExample - hs-source-dirs: test - default-language: Haskell2010 - ghc-options: -Wall - build-depends: base >= 4.6 && < 5, - generics-sop diff --git a/ghc-generics-sop.spec b/ghc-generics-sop.spec index 8b43509..2c62a0a 100644 --- a/ghc-generics-sop.spec +++ b/ghc-generics-sop.spec @@ -1,19 +1,23 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name generics-sop %global pkgver %{pkg_name}-%{version} +%global sopcore sop-core-0.4.0.0 +%global subpkgs %{sopcore} + Name: ghc-%{pkg_name} -Version: 0.3.2.0 -Release: 4%{?dist} +Version: 0.4.0.1 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Generic Programming using True Sums of Products License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{sopcore}/%{sopcore}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -24,8 +28,9 @@ BuildRequires: ghc-doc %if %{with ghc_prof} BuildRequires: ghc-prof %endif -BuildRequires: ghc-rpm-macros -BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath +#BuildRequires: ghc-sop-core-devel BuildRequires: ghc-template-haskell-devel # End cabal-rpm deps @@ -38,6 +43,11 @@ an n-ary product. The module "Generics.SOP" is the main module of this library and contains more detailed documentation. +Since version 0.4.0.0, this package is now based on +''. The core package +contains all the functionality of n-ary sums and products, whereas this package +provides the datatype-generic programming support on top. + Examples of using this library are provided by the following packages: * '' basic examples, @@ -90,22 +100,33 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{sopcore} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -130,6 +151,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Jens Petersen - 0.4.0.1-1 +- update to 0.4.0.1 +- subpackage sop-core + * Thu Jul 25 2019 Fedora Release Engineering - 0.3.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2dfd1cb..5059d6c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (generics-sop-0.3.2.0.tar.gz) = 7cfc9fa53222d6c81c691b351e5b1b296a7f178418a0b4a131f9c514fe883fa7df4abe3f43b98555ac6bb9030c34464505c2b1848f31bf0df37cc4dc4a89ddfb +SHA512 (generics-sop-0.4.0.1.tar.gz) = 5b92823ad3d5c2a78db6cae4b8cf9d9f2b76a06ce683cdaf85b5348715beff57d5e8fb2a7cc271b937451c95af969a0c037f8c2a05a2ed8e56f3ba467762e348 +SHA512 (sop-core-0.4.0.0.tar.gz) = db12039dc17b954d171907c68165806027468bcde2dff5a7f6c43b2fe1afe1dfdc1e947cad9d124bb2f3423a53f5f2237ed71cf69a4a47b5be7d1492b043ce61