From cbfe07314fa7160ce62eab824d981e7e505571015edd1dd6909cc2af82f49036 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:19 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-base64 revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-base64?expand=0&rev=17 --- base64.cabal | 10 +++++----- ghc-base64.changes | 6 ++++++ ghc-base64.spec | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/base64.cabal b/base64.cabal index 8e5f374..5e509fa 100644 --- a/base64.cabal +++ b/base64.cabal @@ -1,7 +1,7 @@ cabal-version: 2.0 name: base64 version: 0.4.2.4 -x-revision: 2 +x-revision: 3 synopsis: A modern RFC 4648-compliant Base64 library description: RFC 4648-compliant Base64 with an eye towards performance and modernity (additional support for RFC 7049 standards) @@ -19,7 +19,7 @@ extra-doc-files: CHANGELOG.md README.md -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.1 +tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.1 || ==9.6.1 source-repository head type: git @@ -52,7 +52,7 @@ library Data.ByteString.Base64.Internal.W64.Loop build-depends: - base >=4.14 && <4.18 + base >=4.14 && <4.19 , bytestring >=0.10 && <0.12 , deepseq >=1.4.3.0 && <1.5 , text >=1.2 && <1.3 || >=2.0 && <2.1 @@ -69,7 +69,7 @@ test-suite tasty other-modules: Internal main-is: Main.hs build-depends: - base >=4.14 && <4.18 + base >=4.14 && <4.19 , base64 , base64-bytestring , bytestring @@ -89,7 +89,7 @@ benchmark bench hs-source-dirs: benchmarks main-is: Base64Bench.hs build-depends: - base >=4.14 && <4.18 + base >=4.14 && <4.19 , base64 , base64-bytestring , bytestring diff --git a/ghc-base64.changes b/ghc-base64.changes index 440685e..b3b0d26 100644 --- a/ghc-base64.changes +++ b/ghc-base64.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 19 19:03:13 UTC 2023 - Peter Simons + +- Update base64 to version 0.4.2.4 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Mon Sep 12 22:10:59 UTC 2022 - Peter Simons diff --git a/ghc-base64.spec b/ghc-base64.spec index 72e6079..e813176 100644 --- a/ghc-base64.spec +++ b/ghc-base64.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-base64 # -# 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 base64 +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} Version: 0.4.2.4 @@ -25,21 +26,33 @@ Summary: A modern RFC 4648-compliant Base64 library 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 +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-text-short-devel +BuildRequires: ghc-text-short-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-random-bytestring-devel +BuildRequires: ghc-random-bytestring-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 %endif %description @@ -56,6 +69,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 @@ -81,4 +110,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc CHANGELOG.md README.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 74ace48b3735c8bbb83c96386301e4d5ac871b5796f9c0e4648f845f0832790b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:28 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-base64 revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-base64?expand=0&rev=18 --- ghc-base64.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-base64.changes b/ghc-base64.changes index b3b0d26..01d5c48 100644 --- a/ghc-base64.changes +++ b/ghc-base64.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:05:53 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Sun Mar 19 19:03:13 UTC 2023 - Peter Simons