From 3d16a1a9066388e58f3178fdd02c0ff1584a6433 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 24 Jan 2023 00:54:45 +0800 Subject: [PATCH] update to 0.13.2 with new deps refresh to cabal-rpm-2.1.0 with SPDX migration --- .gitignore | 6 +++ ghc-skylighting.spec | 90 +++++++++++++++++++++++++++++++++++++++----- sources | 8 +++- 3 files changed, 92 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 3bce4c4..c0aab93 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,9 @@ /skylighting-core-0.10.2.tar.gz /skylighting-0.10.5.2.tar.gz /skylighting-core-0.10.5.2.tar.gz +/skylighting-0.13.2.tar.gz +/skylighting-core-0.13.2.tar.gz +/skylighting-format-ansi-0.1.tar.gz +/skylighting-format-blaze-html-0.1.1.tar.gz +/skylighting-format-context-0.1.0.1.tar.gz +/skylighting-format-latex-0.1.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index c96287f..83ed7f4 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,38 +1,73 @@ -# generated by cabal-rpm-2.0.10 --subpackage +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.10.5.2 -%global subpkgs %{skylightingcore} +%global skylightingcore skylighting-core-0.13.2 +%global skylightingformatansi skylighting-format-ansi-0.1 +%global skylightingformatblazehtml skylighting-format-blaze-html-0.1.1 +%global skylightingformatcontext skylighting-format-context-0.1.0.1 +%global skylightingformatlatex skylighting-format-latex-0.1 +%global subpkgs %{skylightingcore} %{skylightingformatansi} %{skylightingformatblazehtml} %{skylightingformatcontext} %{skylightingformatlatex} Name: ghc-%{pkg_name} -Version: 0.10.5.2 +Version: 0.13.2 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Syntax highlighting library -License: GPLv2+ +License: GPL-2.0-or-later 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/%{skylightingcore}/%{skylightingcore}.tar.gz +Source2: https://hackage.haskell.org/package/%{skylightingformatansi}/%{skylightingformatansi}.tar.gz +Source3: https://hackage.haskell.org/package/%{skylightingformatblazehtml}/%{skylightingformatblazehtml}.tar.gz +Source4: https://hackage.haskell.org/package/%{skylightingformatcontext}/%{skylightingformatcontext}.tar.gz +Source5: https://hackage.haskell.org/package/%{skylightingformatlatex}/%{skylightingformatlatex}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +BuildRequires: ghc-binary-devel +BuildRequires: ghc-containers-devel +#BuildRequires: ghc-skylighting-core-devel +#BuildRequires: ghc-skylighting-format-ansi-devel +#BuildRequires: ghc-skylighting-format-blaze-html-devel +#BuildRequires: ghc-skylighting-format-context-devel +#BuildRequires: ghc-skylighting-format-latex-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-containers-prof #BuildRequires: ghc-skylighting-core-prof +#BuildRequires: ghc-skylighting-format-ansi-prof +#BuildRequires: ghc-skylighting-format-blaze-html-prof +#BuildRequires: ghc-skylighting-format-context-prof +#BuildRequires: ghc-skylighting-format-latex-prof +%endif # for missing dep 'skylighting-core': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-colour-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-safe-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-utf8-string-devel +BuildRequires: ghc-xml-conduit-devel +%if %{with ghc_prof} BuildRequires: ghc-aeson-prof -BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base64-bytestring-prof -BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-colour-prof @@ -44,6 +79,33 @@ BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-utf8-string-prof BuildRequires: ghc-xml-conduit-prof +%endif +# for missing dep 'skylighting-format-ansi': +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-colour-devel +BuildRequires: ghc-text-devel +%if %{with ghc_prof} +BuildRequires: ghc-ansi-terminal-prof +BuildRequires: ghc-colour-prof +BuildRequires: ghc-text-prof +%endif +# for missing dep 'skylighting-format-blaze-html': +BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-text-devel +%if %{with ghc_prof} +BuildRequires: ghc-blaze-html-prof +BuildRequires: ghc-text-prof +%endif +# for missing dep 'skylighting-format-context': +BuildRequires: ghc-text-devel +%if %{with ghc_prof} +BuildRequires: ghc-text-prof +%endif +# for missing dep 'skylighting-format-latex': +BuildRequires: ghc-text-devel +%if %{with ghc_prof} +BuildRequires: ghc-text-prof +%endif # End cabal-rpm deps %description @@ -94,7 +156,11 @@ This package provides the Haskell %{pkg_name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{skylightingcore} +%ghc_lib_subpackage -l BSD-3-Clause %{skylightingcore} +%ghc_lib_subpackage -l BSD-3-Clause %{skylightingformatansi} +%ghc_lib_subpackage -l BSD-3-Clause %{skylightingformatblazehtml} +%ghc_lib_subpackage -l BSD-3-Clause %{skylightingformatcontext} +%ghc_lib_subpackage -l BSD-3-Clause %{skylightingformatlatex} %endif %global version %{main_version} @@ -102,7 +168,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -142,6 +208,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jan 22 2023 Jens Petersen - 0.13.2-5 +- https://hackage.haskell.org/package/skylighting-0.13.2/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.10.5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 8b4f805..50e26f9 100644 --- a/sources +++ b/sources @@ -1,2 +1,6 @@ -SHA512 (skylighting-core-0.10.5.2.tar.gz) = c8cd61c20d758f0b9bef03a6d36bbfeb83e1b355040198044764a14d5cbbae93cdea1ef2cd56f9c482e20c5b657fb201231c28f728c2a0ad0aae6354c678a917 -SHA512 (skylighting-0.10.5.2.tar.gz) = 00799f7058312d38f8d1cd753eab25c0abc0461bf1137de606c52509a608e9594b4aa94e01c53f6ed2effffc83496cec2ce71c478709c88f9a1affc49112bb7c +SHA512 (skylighting-0.13.2.tar.gz) = d9fdb5944b088e340d11947a5c1beaaa30b71764df86229aa670590fe4977adb9721e59c1d2b296691a6382a97151183a806dc59f4bd38aa54a75f9710ea6353 +SHA512 (skylighting-core-0.13.2.tar.gz) = 35cbb8f7bd7382d66b9618baecc0acf7d3f2cbb280df94a0a3c23b92372f0b5ecf0d2c87fe76be2d12feb3f7c84a73f01b5646579c523ca1edbe87b855695302 +SHA512 (skylighting-format-ansi-0.1.tar.gz) = 387af200df34dbd83854ee268a5fa4c157d803b8f766a6da4491b8f19faef88e226027d3906a8c72cab764e53cac12637b1c7ba11b6bbb318aa0ae4dd4910d37 +SHA512 (skylighting-format-blaze-html-0.1.1.tar.gz) = 489ac131d4aad545c854d6c7d1ca40d281e1393251ba8a73603e3faf8d4b6f5e3462e916d1bcfc82d4637c5c2405ad1820b4b5c1ed83fd801d277b6d66e624d7 +SHA512 (skylighting-format-context-0.1.0.1.tar.gz) = b582277924a32af40a96db0f561566b8766ffc622156823567fbec7a0515e33392afef26b8316359edf45beee5bf0da1884ae380a6a9eeb3a8ad0bec3379f3a6 +SHA512 (skylighting-format-latex-0.1.tar.gz) = e73d7ea817e16af8c234c5260bce898ba22932641c7faa5891f902bde39be8f3faa02d2e5185b5f833747bfc57ad70aa9158b3b0c3231e10d795ff6e2be520a7