From 2a5341626749c14fc2d19c41c30f154b6ba163b92ce42479ffa58d7d0d391a03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:20 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-boring revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-boring?expand=0&rev=7 --- boring-0.2.1.tar.gz | 3 ++ boring-0.2.tar.gz | 3 -- boring.cabal | 84 --------------------------------------------- ghc-boring.changes | 15 ++++++++ ghc-boring.spec | 32 ++++++++++++++--- 5 files changed, 46 insertions(+), 91 deletions(-) create mode 100644 boring-0.2.1.tar.gz delete mode 100644 boring-0.2.tar.gz delete mode 100644 boring.cabal diff --git a/boring-0.2.1.tar.gz b/boring-0.2.1.tar.gz new file mode 100644 index 0000000..b46c1b1 --- /dev/null +++ b/boring-0.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1ffddf0f9d50ac8742aa01b270856d57937cc8f7aae783e3b5f3abee7aa3154 +size 5668 diff --git a/boring-0.2.tar.gz b/boring-0.2.tar.gz deleted file mode 100644 index c19bf2f..0000000 --- a/boring-0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bac533b66e754d4fc65ab8d7557eea6f7b35d16998e5e74579b25a372aa4c34 -size 5501 diff --git a/boring.cabal b/boring.cabal deleted file mode 100644 index 128be89..0000000 --- a/boring.cabal +++ /dev/null @@ -1,84 +0,0 @@ -name: boring -version: 0.2 -x-revision: 2 -synopsis: Boring and Absurd types -description: - * @Boring@ types are isomorphic to @()@. - . - * @Absurd@ types are isomorphic to @Void@. - . - See [What does () mean in Haskell -answer by Conor McBride](https://stackoverflow.com/questions/33112439/what-does-mean-in-haskell/33115522#33115522) - -homepage: https://github.com/phadej/boring -bug-reports: https://github.com/phadej/boring/issues -license: BSD3 -license-file: LICENSE -author: Oleg Grenrus -maintainer: Oleg.Grenrus -copyright: (c) 2017-2021 Oleg Grenrus -category: Data -build-type: Simple -extra-source-files: ChangeLog.md -cabal-version: >=1.10 -tested-with: - GHC ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.4 - || ==9.4.1 - -source-repository head - type: git - location: https://github.com/phadej/boring.git - subdir: boring - -flag tagged - description: - You can disable the use of the `tagged` package using `-f-tagged`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - - default: True - manual: True - -library - exposed-modules: Data.Boring - build-depends: - base >=4.5 && <4.18 - , transformers >=0.3 && <0.7 - - if impl(ghc <7.6) - build-depends: ghc-prim - - if !impl(ghc >=7.8) - build-depends: type-equality >=1 && <1.1 - - if !impl(ghc >=7.10) - build-depends: void >=0.7.3 && <0.8 - - if !impl(ghc >=8.0) - build-depends: - semigroups >=0.18.5 && <0.21 - , transformers-compat >=0.5 && <0.8 - - if flag(tagged) || !impl(ghc >=7.8) - build-depends: tagged >=0.8.6 && <0.9 - - other-extensions: - CPP - DefaultSignatures - FlexibleContexts - GADTs - Trustworthy - TypeOperators - - hs-source-dirs: src - default-language: Haskell2010 diff --git a/ghc-boring.changes b/ghc-boring.changes index f33c5ee..5c19800 100644 --- a/ghc-boring.changes +++ b/ghc-boring.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Mar 15 13:19:10 UTC 2023 - Peter Simons + +- Update boring to version 0.2.1. + ## 0.2.1 + + - Add instances for `SNat`, `SSymbol`, and `SChar` + (singletons introduced in `base-4.18.0.0`) + +------------------------------------------------------------------- +Tue Mar 14 09:58:19 UTC 2023 - Peter Simons + +- Update boring to version 0.2 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sun Aug 21 10:46:30 UTC 2022 - Peter Simons diff --git a/ghc-boring.spec b/ghc-boring.spec index 5e86090..b7851e9 100644 --- a/ghc-boring.spec +++ b/ghc-boring.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-boring # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,22 @@ %global pkg_name boring +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.2 +Version: 0.2.1 Release: 0 Summary: Boring and Absurd types License: BSD-3-Clause 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/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-tagged-devel +BuildRequires: ghc-tagged-prof BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof ExcludeArch: %{ix86} %description @@ -49,9 +53,24 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -71,4 +90,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc ChangeLog.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog From 313efdd37948ff377e1e19987d28ea9e29dd655bc13068a1c549704ec493b2ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:29 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-boring revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-boring?expand=0&rev=8 --- ghc-boring.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-boring.changes b/ghc-boring.changes index 5c19800..07f706f 100644 --- a/ghc-boring.changes +++ b/ghc-boring.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:06:03 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Wed Mar 15 13:19:10 UTC 2023 - Peter Simons