From cf633a7519c1bca9569749b71c2e49748059da138e38d56ce575522c3c6db8bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:48 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-scientific revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-scientific?expand=0&rev=89 --- ghc-scientific.changes | 12 ++++++++++++ ghc-scientific.spec | 43 ++++++++++++++++++++++++++++++++++++++++-- scientific.cabal | 13 +++++++------ 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/ghc-scientific.changes b/ghc-scientific.changes index ac75fef..52e133a 100644 --- a/ghc-scientific.changes +++ b/ghc-scientific.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 12 09:49:32 UTC 2023 - Peter Simons + +- Update scientific to version 0.3.7.0 revision 5. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Feb 21 10:26:01 UTC 2023 - Peter Simons + +- Update scientific to version 0.3.7.0 revision 4. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Wed Aug 10 20:38:08 UTC 2022 - Peter Simons diff --git a/ghc-scientific.spec b/ghc-scientific.spec index fe9d33e..2f94f4e 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-scientific # -# 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,6 +17,7 @@ %global pkg_name scientific +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} Version: 0.3.7.0 @@ -25,26 +26,43 @@ Summary: Numbers represented using scientific notation 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/3.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/5.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-binary-devel +BuildRequires: ghc-binary-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-hashable-devel +BuildRequires: ghc-hashable-prof BuildRequires: ghc-integer-logarithms-devel +BuildRequires: ghc-integer-logarithms-prof BuildRequires: ghc-primitive-devel +BuildRequires: ghc-primitive-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-smallcheck-devel +BuildRequires: ghc-smallcheck-prof BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-quickcheck-prof BuildRequires: ghc-tasty-smallcheck-devel +BuildRequires: ghc-tasty-smallcheck-prof %endif %description @@ -87,6 +105,22 @@ 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 @@ -112,4 +146,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc changelog +%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 diff --git a/scientific.cabal b/scientific.cabal index 424ee67..5eb5184 100644 --- a/scientific.cabal +++ b/scientific.cabal @@ -1,6 +1,6 @@ name: scientific version: 0.3.7.0 -x-revision: 3 +x-revision: 5 synopsis: Numbers represented using scientific notation description: "Data.Scientific" provides the number type 'Scientific'. Scientific numbers are @@ -54,8 +54,9 @@ tested-with: || ==8.8.4 || ==8.10.7 || ==9.0.2 - || ==9.2.4 - || ==9.4.1 + || ==9.2.6 + || ==9.4.4 + || ==9.6.1 source-repository head type: git @@ -89,14 +90,14 @@ library ghc-options: -Wall build-depends: - base >=4.5 && <4.18 + base >=4.5 && <4.19 , binary >=0.5.1 && <0.9 , containers >=0.4.2.1 && <0.7 , deepseq >=1.3.0.0 && <1.5 , hashable >=1.2.7.0 && <1.5 , integer-logarithms >=1.0.3.1 && <1.1 - , primitive >=0.7.1.0 && <0.8 - , template-haskell >=2.8 && <2.20 + , primitive >=0.7.1.0 && <0.9 + , template-haskell >=2.8 && <2.21 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1 if flag(bytestring-builder) From c2049e1b5f34d13f15b70e9b15945dbf581c3b9c3a603c7487b9997265111d50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:50 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-scientific revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-scientific?expand=0&rev=90 --- ghc-scientific.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-scientific.changes b/ghc-scientific.changes index 52e133a..170cb11 100644 --- a/ghc-scientific.changes +++ b/ghc-scientific.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:08:09 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Sun Mar 12 09:49:32 UTC 2023 - Peter Simons