From 81a8a2f4c04ebd5ce8f2e103b49f23c2729fb8da Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 4 Mar 2019 15:00:19 +0000 Subject: [PATCH 01/21] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..30584f6 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-base-compat-batteries + +The ghc-base-compat-batteries package \ No newline at end of file From f6ad27a5477b802b5a4512c986ae8d9a5b89cc64 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2019 13:21:01 +0800 Subject: [PATCH 02/21] import (#1684314) --- .gitignore | 1 + ghc-base-compat-batteries.spec | 107 +++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 109 insertions(+) create mode 100644 .gitignore create mode 100644 ghc-base-compat-batteries.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..612343b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/base-compat-batteries-0.10.1.tar.gz diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec new file mode 100644 index 0000000..1183d0c --- /dev/null +++ b/ghc-base-compat-batteries.spec @@ -0,0 +1,107 @@ +# generated by cabal-rpm-0.13 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name base-compat-batteries +%global pkgver %{pkg_name}-%{version} + +%bcond_without tests + +Name: ghc-%{pkg_name} +Version: 0.10.1 +Release: 1%{?dist} +Summary: Base-compat with extra batteries + +License: MIT +Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources + +# Begin cabal-rpm deps: +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +BuildRequires: ghc-base-compat-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-hspec-devel +%endif +# End cabal-rpm deps + +%description +Provides functions available in later versions of 'base' to a wider range of +compilers, without requiring you to use CPP pragmas in your code. + +This package provides the same API as the +'' library, but +depends on compatibility packages (such as 'semigroups') to offer a wider +support window than 'base-compat', which has no dependencies. Most of the +modules in this library have the same names as in 'base-compat' to make it +easier to switch between the two. There also exist versions of each module with +the suffix '.Repl.Batteries', which are distinct from anything in +'base-compat', to allow for easier use in GHCi. + +See +'' for a more comprehensive list of differences between 'base-compat' and +'base-compat-batteries'. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +%endif +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development +files. + + +%prep +# Begin cabal-rpm setup: +%setup -q -n %{pkgver} +# End cabal-rpm setup + + +%build +# Begin cabal-rpm build: +%ghc_lib_build +# End cabal-rpm build + + +%install +# Begin cabal-rpm install +%ghc_lib_install +# End cabal-rpm install + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +# Begin cabal-rpm files: +%license LICENSE +# End cabal-rpm files + + +%files devel -f %{name}-devel.files +%doc CHANGES.markdown README.markdown + + +%changelog +* Sun Feb 24 2019 Fedora Haskell SIG - 0.10.1-1 +- spec file generated by cabal-rpm-0.13 diff --git a/sources b/sources new file mode 100644 index 0000000..3e38604 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (base-compat-batteries-0.10.1.tar.gz) = 7fc65b961b3b6bde315cf0d26fdcbbb0712af930cfb643b8f8ecba8ee02f9a7d0ba014a10014bdf38b688f2e4d1ccbcaa8cab445f64975afb7fee3e7f632bcb9 From 43c79af51f53bc2ca7b6f648c53ba82e15521742 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2019 13:25:43 +0800 Subject: [PATCH 03/21] bump release over hledger-lib --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 1183d0c..ccbb932 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -103,5 +103,8 @@ files. %changelog +* Sun Mar 10 2019 Jens Petersen - 0.10.1-2 +- bump over hledger-lib + * Sun Feb 24 2019 Fedora Haskell SIG - 0.10.1-1 - spec file generated by cabal-rpm-0.13 From da95b830b74885a49348fb5e1783c433d781b0f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 31 Mar 2019 21:54:29 +0800 Subject: [PATCH 04/21] disable tests --- ghc-base-compat-batteries.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index ccbb932..86a1324 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -4,7 +4,7 @@ %global pkg_name base-compat-batteries %global pkgver %{pkg_name}-%{version} -%bcond_without tests +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.10.1 @@ -105,6 +105,7 @@ files. %changelog * Sun Mar 10 2019 Jens Petersen - 0.10.1-2 - bump over hledger-lib +- disable tests * Sun Feb 24 2019 Fedora Haskell SIG - 0.10.1-1 - spec file generated by cabal-rpm-0.13 From 9bcabdadafc8d9e2ec687a7d797f5e5f70e2cb7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:07:50 +0000 Subject: [PATCH 05/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 86a1324..b812247 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -103,6 +103,9 @@ files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Mar 10 2019 Jens Petersen - 0.10.1-2 - bump over hledger-lib - disable tests From 48d17fbfcb01ac0b14feecf7ee501938234971be Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:38 +0000 Subject: [PATCH 06/21] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-base-compat-batteries.spec | 49 +++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index b812247..e3b2949 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name base-compat-batteries @@ -19,6 +19,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-compat-devel %if %{with tests} @@ -49,11 +55,8 @@ here>' for a more comprehensive list of differences between 'base-compat' and %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -62,6 +65,26 @@ This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library +documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -84,14 +107,6 @@ files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -102,6 +117,16 @@ files. %doc CHANGES.markdown README.markdown +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 0.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9aa255e9800dd27b34cf2ee23d34a5640afcacfc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:14:04 +0000 Subject: [PATCH 07/21] update to 0.10.5 --- .gitignore | 1 + base-compat-batteries-0.10.5.cabal | 239 +++++++++++++++++++++++++++++ ghc-base-compat-batteries.spec | 10 +- sources | 2 +- 4 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 base-compat-batteries-0.10.5.cabal diff --git a/.gitignore b/.gitignore index 612343b..5c17db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /base-compat-batteries-0.10.1.tar.gz +/base-compat-batteries-0.10.5.tar.gz diff --git a/base-compat-batteries-0.10.5.cabal b/base-compat-batteries-0.10.5.cabal new file mode 100644 index 0000000..a478695 --- /dev/null +++ b/base-compat-batteries-0.10.5.cabal @@ -0,0 +1,239 @@ +name: base-compat-batteries +version: 0.10.5 +x-revision: 1 +license: MIT +license-file: LICENSE +copyright: (c) 2012-2018 Simon Hengel, + (c) 2014-2018 João Cristóvão, + (c) 2015-2018 Ryan Scott +author: Simon Hengel , + João Cristóvão , + Ryan Scott +maintainer: Simon Hengel , + João Cristóvão , + Ryan Scott +build-type: Simple +cabal-version: >= 1.8 +category: Compatibility +synopsis: base-compat with extra batteries +description: Provides functions available in later versions of @base@ to + a wider range of compilers, without requiring you to use CPP + pragmas in your code. + . + This package provides the same API as the + @@ + library, but depends on compatibility packages + (such as @semigroups@) to offer a wider support window than + @base-compat@, which has no dependencies. Most of the modules + in this library have the same names as in @base-compat@ + to make it easier to switch between the two. There also exist + versions of each module with the suffix @.Repl.Batteries@, + which are distinct from anything in @base-compat@, to allow + for easier use in GHCi. + . + See + @@ + for a more comprehensive list of differences between + @base-compat@ and @base-compat-batteries@. +tested-with: GHC == 7.0.* + , GHC == 7.2.* + , GHC == 7.4.* + , GHC == 7.6.* + , GHC == 7.8.* + , GHC == 7.10.* + , GHC == 8.0.* + , GHC == 8.2.* + , GHC == 8.4.* + , GHC == 8.6.* +extra-source-files: CHANGES.markdown, README.markdown + +source-repository head + type: git + location: https://github.com/haskell-compat/base-compat + subdir: base-compat-batteries + +library + ghc-options: + -Wall + build-depends: + base >= 4.3 && < 5, + base-compat == 0.10.5 + if !impl(ghc >= 7.8) + build-depends: + tagged >= 0.8.5 && < 0.9 + if !impl(ghc >= 7.10) + build-depends: + nats >= 1.1.2 && < 1.2, + void >= 0.7.2 && < 0.8 + if !impl(ghc >= 8.0) + build-depends: + fail >= 4.9.0.0 && < 4.10, + semigroups >= 0.18.4 && < 0.20, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.6 && < 0.7 + if !impl(ghc >= 8.2) + build-depends: + bifunctors >= 5.5.2 && < 5.6 + if !impl(ghc >= 8.6) + build-depends: + contravariant >= 1.5 && < 1.6 + ghc-options: + -fno-warn-duplicate-exports + + hs-source-dirs: + src + + exposed-modules: + Control.Concurrent.Compat + Control.Concurrent.MVar.Compat + Control.Exception.Compat + Control.Monad.Compat + Control.Monad.Fail.Compat + Control.Monad.IO.Class.Compat + Control.Monad.ST.Lazy.Unsafe.Compat + Control.Monad.ST.Unsafe.Compat + Data.Bifoldable.Compat + Data.Bifunctor.Compat + Data.Bitraversable.Compat + Data.Bits.Compat + Data.Bool.Compat + Data.Complex.Compat + Data.Either.Compat + Data.Foldable.Compat + Data.Function.Compat + Data.Functor.Compat + Data.Functor.Compose.Compat + Data.Functor.Const.Compat + Data.Functor.Contravariant.Compat + Data.Functor.Identity.Compat + Data.Functor.Product.Compat + Data.Functor.Sum.Compat + Data.IORef.Compat + Data.List.Compat + Data.List.NonEmpty.Compat + Data.Monoid.Compat + Data.Proxy.Compat + Data.Ratio.Compat + Data.Semigroup.Compat + Data.STRef.Compat + Data.String.Compat + Data.Type.Coercion.Compat + Data.Version.Compat + Data.Void.Compat + Data.Word.Compat + Debug.Trace.Compat + Foreign.Compat + Foreign.ForeignPtr.Compat + Foreign.ForeignPtr.Safe.Compat + Foreign.ForeignPtr.Unsafe.Compat + Foreign.Marshal.Alloc.Compat + Foreign.Marshal.Array.Compat + Foreign.Marshal.Compat + Foreign.Marshal.Safe.Compat + Foreign.Marshal.Unsafe.Compat + Foreign.Marshal.Utils.Compat + Numeric.Compat + Numeric.Natural.Compat + Prelude.Compat + System.Environment.Compat + System.Exit.Compat + System.IO.Unsafe.Compat + Text.Read.Compat + Type.Reflection.Compat + + Control.Concurrent.Compat.Repl.Batteries + Control.Concurrent.MVar.Compat.Repl.Batteries + Control.Exception.Compat.Repl.Batteries + Control.Monad.Compat.Repl.Batteries + Control.Monad.Fail.Compat.Repl.Batteries + Control.Monad.IO.Class.Compat.Repl.Batteries + Control.Monad.ST.Lazy.Unsafe.Compat.Repl.Batteries + Control.Monad.ST.Unsafe.Compat.Repl.Batteries + Data.Bifoldable.Compat.Repl.Batteries + Data.Bifunctor.Compat.Repl.Batteries + Data.Bitraversable.Compat.Repl.Batteries + Data.Bits.Compat.Repl.Batteries + Data.Bool.Compat.Repl.Batteries + Data.Complex.Compat.Repl.Batteries + Data.Either.Compat.Repl.Batteries + Data.Foldable.Compat.Repl.Batteries + Data.Function.Compat.Repl.Batteries + Data.Functor.Compat.Repl.Batteries + Data.Functor.Compose.Compat.Repl.Batteries + Data.Functor.Const.Compat.Repl.Batteries + Data.Functor.Identity.Compat.Repl.Batteries + Data.Functor.Contravariant.Compat.Repl.Batteries + Data.Functor.Product.Compat.Repl.Batteries + Data.Functor.Sum.Compat.Repl.Batteries + Data.IORef.Compat.Repl.Batteries + Data.List.Compat.Repl.Batteries + Data.List.NonEmpty.Compat.Repl.Batteries + Data.Monoid.Compat.Repl.Batteries + Data.Proxy.Compat.Repl.Batteries + Data.Ratio.Compat.Repl.Batteries + Data.Semigroup.Compat.Repl.Batteries + Data.STRef.Compat.Repl.Batteries + Data.String.Compat.Repl.Batteries + Data.Type.Coercion.Compat.Repl.Batteries + Data.Version.Compat.Repl.Batteries + Data.Void.Compat.Repl.Batteries + Data.Word.Compat.Repl.Batteries + Debug.Trace.Compat.Repl.Batteries + Foreign.Compat.Repl.Batteries + Foreign.ForeignPtr.Compat.Repl.Batteries + Foreign.ForeignPtr.Safe.Compat.Repl.Batteries + Foreign.ForeignPtr.Unsafe.Compat.Repl.Batteries + Foreign.Marshal.Alloc.Compat.Repl.Batteries + Foreign.Marshal.Array.Compat.Repl.Batteries + Foreign.Marshal.Compat.Repl.Batteries + Foreign.Marshal.Safe.Compat.Repl.Batteries + Foreign.Marshal.Unsafe.Compat.Repl.Batteries + Foreign.Marshal.Utils.Compat.Repl.Batteries + Numeric.Compat.Repl.Batteries + Numeric.Natural.Compat.Repl.Batteries + Prelude.Compat.Repl.Batteries + System.Environment.Compat.Repl.Batteries + System.Exit.Compat.Repl.Batteries + System.IO.Unsafe.Compat.Repl.Batteries + Text.Read.Compat.Repl.Batteries + Type.Reflection.Compat.Repl.Batteries +test-suite spec + type: + exitcode-stdio-1.0 + ghc-options: + -Wall + hs-source-dirs: + test + main-is: + Spec.hs + other-modules: + Control.Monad.CompatSpec + Data.Bits.CompatSpec + Data.Bool.CompatSpec + Data.Either.CompatSpec + Data.Foldable.CompatSpec + Data.Function.CompatSpec + Data.Functor.CompatSpec + Data.IORef.CompatSpec + Data.List.CompatSpec + Data.Monoid.CompatSpec + Data.STRef.CompatSpec + Data.Version.CompatSpec + Data.Word.CompatSpec + Foreign.Marshal.Alloc.CompatSpec + Foreign.Marshal.Utils.CompatSpec + Numeric.CompatSpec + Prelude.CompatSpec + System.Environment.CompatSpec + Text.Read.CompatSpec + + -- Other tests + SafeHaskellSpec + TestHspecTrustworthy + build-depends: + base >= 4.3 && < 5 + , base-compat-batteries + , hspec >= 1.8 + , QuickCheck + build-tool-depends: + hspec-discover:hspec-discover >= 1.8 diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index e3b2949..1447d91 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -7,14 +7,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.1 -Release: 3%{?dist} +Version: 0.10.5 +Release: 1%{?dist} Summary: Base-compat with extra batteries License: MIT 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 # End cabal-rpm sources # Begin cabal-rpm deps: @@ -27,6 +28,7 @@ BuildRequires: ghc-prof %endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-contravariant-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel @@ -88,6 +90,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -128,6 +131,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 0.10.5-1 +- update to 0.10.5 + * Thu Jul 25 2019 Fedora Release Engineering - 0.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3e38604..92e52b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-compat-batteries-0.10.1.tar.gz) = 7fc65b961b3b6bde315cf0d26fdcbbb0712af930cfb643b8f8ecba8ee02f9a7d0ba014a10014bdf38b688f2e4d1ccbcaa8cab445f64975afb7fee3e7f632bcb9 +SHA512 (base-compat-batteries-0.10.5.tar.gz) = 6f8ebbad8ca5ae54257e9637d36eec48887cfae2e34d0a78339993f63f68419cc86fb031f1d955f129416cf0913e34f243aafe272fcbc5b8b6b43835f898df7f From 4fd98d22a40ac5a54b7891cd74acf8da32b9ed4e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:35 +0800 Subject: [PATCH 08/21] BR prof for lib and static for executable --- ghc-base-compat-batteries.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 1447d91..45a95b5 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name base-compat-batteries @@ -20,15 +20,9 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-contravariant-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel @@ -57,6 +51,7 @@ here>' for a more comprehensive list of differences between 'base-compat' and %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From 0c3c7940eabd706d2ec12f215c48bc30d190fed5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:17:51 +0000 Subject: [PATCH 09/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 45a95b5..1803ba5 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.10.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -126,6 +126,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.10.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 0.10.5-1 - update to 0.10.5 From 583200a3572f8e7dacfbed1d5b7330a4d367d43f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 11:49:55 +0800 Subject: [PATCH 10/21] refresh to cabal-rpm-2.0.2 --- ghc-base-compat-batteries.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 1803ba5..ef931b1 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name base-compat-batteries @@ -65,6 +65,7 @@ files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library @@ -76,6 +77,7 @@ documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -105,6 +107,16 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -117,6 +129,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 6565c5e3406b956478bcc4238c9f2f770a624135 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Feb 2020 01:17:33 +0800 Subject: [PATCH 11/21] enable tests --- ghc-base-compat-batteries.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index ef931b1..7bd888e 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -4,11 +4,11 @@ %global pkg_name base-compat-batteries %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.10.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -139,6 +139,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Feb 20 2020 Jens Petersen - 0.10.5-3 +- enable tests + * Tue Jan 28 2020 Fedora Release Engineering - 0.10.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7db63fed039225d55d2af7db030a99a7a4cfdd79 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:17 +0800 Subject: [PATCH 12/21] refresh to cabal-rpm-2.0.5 --- ghc-base-compat-batteries.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 7bd888e..6a69b25 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name base-compat-batteries %global pkgver %{pkg_name}-%{version} From f95e9c1c62e4d530890b9eeb3745afd819fbec82 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 00:11:43 +0800 Subject: [PATCH 13/21] update to 0.11.1 --- .gitignore | 1 + base-compat-batteries-0.10.5.cabal | 239 ----------------------------- ghc-base-compat-batteries.spec | 9 +- sources | 2 +- 4 files changed, 7 insertions(+), 244 deletions(-) delete mode 100644 base-compat-batteries-0.10.5.cabal diff --git a/.gitignore b/.gitignore index 5c17db0..6de4026 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /base-compat-batteries-0.10.1.tar.gz /base-compat-batteries-0.10.5.tar.gz +/base-compat-batteries-0.11.1.tar.gz diff --git a/base-compat-batteries-0.10.5.cabal b/base-compat-batteries-0.10.5.cabal deleted file mode 100644 index a478695..0000000 --- a/base-compat-batteries-0.10.5.cabal +++ /dev/null @@ -1,239 +0,0 @@ -name: base-compat-batteries -version: 0.10.5 -x-revision: 1 -license: MIT -license-file: LICENSE -copyright: (c) 2012-2018 Simon Hengel, - (c) 2014-2018 João Cristóvão, - (c) 2015-2018 Ryan Scott -author: Simon Hengel , - João Cristóvão , - Ryan Scott -maintainer: Simon Hengel , - João Cristóvão , - Ryan Scott -build-type: Simple -cabal-version: >= 1.8 -category: Compatibility -synopsis: base-compat with extra batteries -description: Provides functions available in later versions of @base@ to - a wider range of compilers, without requiring you to use CPP - pragmas in your code. - . - This package provides the same API as the - @@ - library, but depends on compatibility packages - (such as @semigroups@) to offer a wider support window than - @base-compat@, which has no dependencies. Most of the modules - in this library have the same names as in @base-compat@ - to make it easier to switch between the two. There also exist - versions of each module with the suffix @.Repl.Batteries@, - which are distinct from anything in @base-compat@, to allow - for easier use in GHCi. - . - See - @@ - for a more comprehensive list of differences between - @base-compat@ and @base-compat-batteries@. -tested-with: GHC == 7.0.* - , GHC == 7.2.* - , GHC == 7.4.* - , GHC == 7.6.* - , GHC == 7.8.* - , GHC == 7.10.* - , GHC == 8.0.* - , GHC == 8.2.* - , GHC == 8.4.* - , GHC == 8.6.* -extra-source-files: CHANGES.markdown, README.markdown - -source-repository head - type: git - location: https://github.com/haskell-compat/base-compat - subdir: base-compat-batteries - -library - ghc-options: - -Wall - build-depends: - base >= 4.3 && < 5, - base-compat == 0.10.5 - if !impl(ghc >= 7.8) - build-depends: - tagged >= 0.8.5 && < 0.9 - if !impl(ghc >= 7.10) - build-depends: - nats >= 1.1.2 && < 1.2, - void >= 0.7.2 && < 0.8 - if !impl(ghc >= 8.0) - build-depends: - fail >= 4.9.0.0 && < 4.10, - semigroups >= 0.18.4 && < 0.20, - transformers >= 0.2 && < 0.6, - transformers-compat >= 0.6 && < 0.7 - if !impl(ghc >= 8.2) - build-depends: - bifunctors >= 5.5.2 && < 5.6 - if !impl(ghc >= 8.6) - build-depends: - contravariant >= 1.5 && < 1.6 - ghc-options: - -fno-warn-duplicate-exports - - hs-source-dirs: - src - - exposed-modules: - Control.Concurrent.Compat - Control.Concurrent.MVar.Compat - Control.Exception.Compat - Control.Monad.Compat - Control.Monad.Fail.Compat - Control.Monad.IO.Class.Compat - Control.Monad.ST.Lazy.Unsafe.Compat - Control.Monad.ST.Unsafe.Compat - Data.Bifoldable.Compat - Data.Bifunctor.Compat - Data.Bitraversable.Compat - Data.Bits.Compat - Data.Bool.Compat - Data.Complex.Compat - Data.Either.Compat - Data.Foldable.Compat - Data.Function.Compat - Data.Functor.Compat - Data.Functor.Compose.Compat - Data.Functor.Const.Compat - Data.Functor.Contravariant.Compat - Data.Functor.Identity.Compat - Data.Functor.Product.Compat - Data.Functor.Sum.Compat - Data.IORef.Compat - Data.List.Compat - Data.List.NonEmpty.Compat - Data.Monoid.Compat - Data.Proxy.Compat - Data.Ratio.Compat - Data.Semigroup.Compat - Data.STRef.Compat - Data.String.Compat - Data.Type.Coercion.Compat - Data.Version.Compat - Data.Void.Compat - Data.Word.Compat - Debug.Trace.Compat - Foreign.Compat - Foreign.ForeignPtr.Compat - Foreign.ForeignPtr.Safe.Compat - Foreign.ForeignPtr.Unsafe.Compat - Foreign.Marshal.Alloc.Compat - Foreign.Marshal.Array.Compat - Foreign.Marshal.Compat - Foreign.Marshal.Safe.Compat - Foreign.Marshal.Unsafe.Compat - Foreign.Marshal.Utils.Compat - Numeric.Compat - Numeric.Natural.Compat - Prelude.Compat - System.Environment.Compat - System.Exit.Compat - System.IO.Unsafe.Compat - Text.Read.Compat - Type.Reflection.Compat - - Control.Concurrent.Compat.Repl.Batteries - Control.Concurrent.MVar.Compat.Repl.Batteries - Control.Exception.Compat.Repl.Batteries - Control.Monad.Compat.Repl.Batteries - Control.Monad.Fail.Compat.Repl.Batteries - Control.Monad.IO.Class.Compat.Repl.Batteries - Control.Monad.ST.Lazy.Unsafe.Compat.Repl.Batteries - Control.Monad.ST.Unsafe.Compat.Repl.Batteries - Data.Bifoldable.Compat.Repl.Batteries - Data.Bifunctor.Compat.Repl.Batteries - Data.Bitraversable.Compat.Repl.Batteries - Data.Bits.Compat.Repl.Batteries - Data.Bool.Compat.Repl.Batteries - Data.Complex.Compat.Repl.Batteries - Data.Either.Compat.Repl.Batteries - Data.Foldable.Compat.Repl.Batteries - Data.Function.Compat.Repl.Batteries - Data.Functor.Compat.Repl.Batteries - Data.Functor.Compose.Compat.Repl.Batteries - Data.Functor.Const.Compat.Repl.Batteries - Data.Functor.Identity.Compat.Repl.Batteries - Data.Functor.Contravariant.Compat.Repl.Batteries - Data.Functor.Product.Compat.Repl.Batteries - Data.Functor.Sum.Compat.Repl.Batteries - Data.IORef.Compat.Repl.Batteries - Data.List.Compat.Repl.Batteries - Data.List.NonEmpty.Compat.Repl.Batteries - Data.Monoid.Compat.Repl.Batteries - Data.Proxy.Compat.Repl.Batteries - Data.Ratio.Compat.Repl.Batteries - Data.Semigroup.Compat.Repl.Batteries - Data.STRef.Compat.Repl.Batteries - Data.String.Compat.Repl.Batteries - Data.Type.Coercion.Compat.Repl.Batteries - Data.Version.Compat.Repl.Batteries - Data.Void.Compat.Repl.Batteries - Data.Word.Compat.Repl.Batteries - Debug.Trace.Compat.Repl.Batteries - Foreign.Compat.Repl.Batteries - Foreign.ForeignPtr.Compat.Repl.Batteries - Foreign.ForeignPtr.Safe.Compat.Repl.Batteries - Foreign.ForeignPtr.Unsafe.Compat.Repl.Batteries - Foreign.Marshal.Alloc.Compat.Repl.Batteries - Foreign.Marshal.Array.Compat.Repl.Batteries - Foreign.Marshal.Compat.Repl.Batteries - Foreign.Marshal.Safe.Compat.Repl.Batteries - Foreign.Marshal.Unsafe.Compat.Repl.Batteries - Foreign.Marshal.Utils.Compat.Repl.Batteries - Numeric.Compat.Repl.Batteries - Numeric.Natural.Compat.Repl.Batteries - Prelude.Compat.Repl.Batteries - System.Environment.Compat.Repl.Batteries - System.Exit.Compat.Repl.Batteries - System.IO.Unsafe.Compat.Repl.Batteries - Text.Read.Compat.Repl.Batteries - Type.Reflection.Compat.Repl.Batteries -test-suite spec - type: - exitcode-stdio-1.0 - ghc-options: - -Wall - hs-source-dirs: - test - main-is: - Spec.hs - other-modules: - Control.Monad.CompatSpec - Data.Bits.CompatSpec - Data.Bool.CompatSpec - Data.Either.CompatSpec - Data.Foldable.CompatSpec - Data.Function.CompatSpec - Data.Functor.CompatSpec - Data.IORef.CompatSpec - Data.List.CompatSpec - Data.Monoid.CompatSpec - Data.STRef.CompatSpec - Data.Version.CompatSpec - Data.Word.CompatSpec - Foreign.Marshal.Alloc.CompatSpec - Foreign.Marshal.Utils.CompatSpec - Numeric.CompatSpec - Prelude.CompatSpec - System.Environment.CompatSpec - Text.Read.CompatSpec - - -- Other tests - SafeHaskellSpec - TestHspecTrustworthy - build-depends: - base >= 4.3 && < 5 - , base-compat-batteries - , hspec >= 1.8 - , QuickCheck - build-tool-depends: - hspec-discover:hspec-discover >= 1.8 diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 6a69b25..0c8bb43 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -7,15 +7,14 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.10.5 -Release: 3%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: Base-compat with extra batteries License: MIT 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 # End cabal-rpm sources # Begin cabal-rpm deps: @@ -87,7 +86,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -139,6 +137,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jun 07 2020 Jens Petersen - 0.11.1-1 +- update to 0.11.1 + * Thu Feb 20 2020 Jens Petersen - 0.10.5-3 - enable tests diff --git a/sources b/sources index 92e52b8..6ef5820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-compat-batteries-0.10.5.tar.gz) = 6f8ebbad8ca5ae54257e9637d36eec48887cfae2e34d0a78339993f63f68419cc86fb031f1d955f129416cf0913e34f243aafe272fcbc5b8b6b43835f898df7f +SHA512 (base-compat-batteries-0.11.1.tar.gz) = a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217 From bb2f9dc951020f3c919e8c55c2044c292ffae325 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:54 +0800 Subject: [PATCH 14/21] refresh to cabal-rpm-2.0.6 --- ghc-base-compat-batteries.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 0c8bb43..919d84b 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name base-compat-batteries @@ -25,6 +25,7 @@ BuildRequires: ghc-base-compat-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-discover-devel %endif # End cabal-rpm deps @@ -105,16 +106,6 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From f03ef5d05f1fa3275d934355e06942d467ac19a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:48:47 +0000 Subject: [PATCH 15/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 919d84b..0433ae1 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -128,6 +128,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Jens Petersen - 0.11.1-1 - update to 0.11.1 From eb04450c2b5b0c2e24af248c8951926886c627be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:53:06 +0000 Subject: [PATCH 16/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 0433ae1..6e5c4d1 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -128,6 +128,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 93314349035148be1bb3bb601e993866c9e51509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:19:55 +0000 Subject: [PATCH 17/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 6e5c4d1..1bfee90 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -128,6 +128,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 61adf84d2643bd849683c9b1e7ef670390d54c31 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 08:42:58 +0800 Subject: [PATCH 18/21] update to 0.11.2 --- .gitignore | 1 + ghc-base-compat-batteries.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6de4026..7a8e157 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /base-compat-batteries-0.10.1.tar.gz /base-compat-batteries-0.10.5.tar.gz /base-compat-batteries-0.11.1.tar.gz +/base-compat-batteries-0.11.2.tar.gz diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 1bfee90..ef1a71d 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -7,8 +7,8 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.11.1 -Release: 4%{?dist} +Version: 0.11.2 +Release: 1%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -32,15 +32,10 @@ BuildRequires: ghc-hspec-discover-devel %description Provides functions available in later versions of 'base' to a wider range of compilers, without requiring you to use CPP pragmas in your code. +the suffix '.Repl.Batteries', which are distinct from anything in -This package provides the same API as the -'' library, but depends on compatibility packages (such as 'semigroups') to offer a wider support window than 'base-compat', which has no dependencies. Most of the -modules in this library have the same names as in 'base-compat' to make it -easier to switch between the two. There also exist versions of each module with -the suffix '.Repl.Batteries', which are distinct from anything in -'base-compat', to allow for easier use in GHCi. See ' - 0.11.2-1 +- update to 0.11.2 + * Thu Jul 22 2021 Fedora Release Engineering - 0.11.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6ef5820..e13d964 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-compat-batteries-0.11.1.tar.gz) = a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217 +SHA512 (base-compat-batteries-0.11.2.tar.gz) = 0b54b53bb762ca99cbfe82799a63f73229447325438ccae4849df676d14a4758177d9481391b628cca7921d9796ac3172ad8226b2530e151b7c59f86b82f381a From e5c6968fa62db765cdd05e99c5dd47c1d934bed1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 19/21] refresh to cabal-rpm-2.0.9 --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index ef1a71d..1e8b2fa 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name base-compat-batteries @@ -61,6 +61,7 @@ files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library @@ -98,7 +99,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 1d0c8014499d58e0ba16492ae3c4f82837335da6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:32:21 +0000 Subject: [PATCH 20/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-compat-batteries.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-compat-batteries.spec b/ghc-base-compat-batteries.spec index 1e8b2fa..ec92453 100644 --- a/ghc-base-compat-batteries.spec +++ b/ghc-base-compat-batteries.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Base-compat with extra batteries License: MIT @@ -126,6 +126,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.11.2-1 - update to 0.11.2 From e3089edf99d3f9a324694476f27998c85e0dcd02 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:22:40 +0300 Subject: [PATCH 21/21] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 30584f6..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-base-compat-batteries - -The ghc-base-compat-batteries package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index e13d964..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (base-compat-batteries-0.11.2.tar.gz) = 0b54b53bb762ca99cbfe82799a63f73229447325438ccae4849df676d14a4758177d9481391b628cca7921d9796ac3172ad8226b2530e151b7c59f86b82f381a