From 2dba17b50baa3c772faa7f716421cd015a5b06b8a1fe055a49fb4cb9a2bae3df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:49 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-skylighting revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=87 --- ghc-skylighting.changes | 12 ++++++++++++ ghc-skylighting.spec | 39 +++++++++++++++++++++++++++++++++++-- skylighting-0.13.2.1.tar.gz | 3 +++ skylighting-0.13.2.tar.gz | 3 --- 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 skylighting-0.13.2.1.tar.gz delete mode 100644 skylighting-0.13.2.tar.gz diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index 565b324..b77b679 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 8 23:11:47 UTC 2023 - Peter Simons + +- Update skylighting to version 0.13.2.1. + ## 0.13.2.1 + + * Update tango style for new token types (#164). The original + tango style didn't have colors defined for many token types + that have been added since it was added. This commit + updates the style to support them. Thanks to @danbraswell + for providing the values needed. + ------------------------------------------------------------------- Sun Dec 18 02:14:49 UTC 2022 - Peter Simons diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index f9ebb51..53513e5 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-skylighting # -# 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,8 +17,9 @@ %global pkg_name skylighting +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.13.2 +Version: 0.13.2.1 Release: 0 Summary: Syntax highlighting library License: GPL-2.0-or-later @@ -26,18 +27,31 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: chrpath BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-binary-devel +BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-pretty-show-devel +BuildRequires: ghc-pretty-show-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-skylighting-core-devel +BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-skylighting-format-ansi-devel +BuildRequires: ghc-skylighting-format-ansi-prof BuildRequires: ghc-skylighting-format-blaze-html-devel +BuildRequires: ghc-skylighting-format-blaze-html-prof BuildRequires: ghc-skylighting-format-context-devel +BuildRequires: ghc-skylighting-format-context-prof BuildRequires: ghc-skylighting-format-latex-devel +BuildRequires: ghc-skylighting-format-latex-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof ExcludeArch: %{ix86} %description @@ -59,6 +73,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} @@ -83,4 +113,9 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %doc README.md 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 diff --git a/skylighting-0.13.2.1.tar.gz b/skylighting-0.13.2.1.tar.gz new file mode 100644 index 0000000..fc47762 --- /dev/null +++ b/skylighting-0.13.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f074b2d8a228dbadddc026939e1e76a3c06c1f650c41a154bee3dcb615430653 +size 1249668 diff --git a/skylighting-0.13.2.tar.gz b/skylighting-0.13.2.tar.gz deleted file mode 100644 index f24bddb..0000000 --- a/skylighting-0.13.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e920cd246fe2107a0e302196c6e776b18e9e2c8ad68026fa2d8ae1d6d2980436 -size 1249526 From fd6e1c2971ee53a0ad03b60c7c39677832c3d7d36da809bcc4c3bfbf431c9d55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:51 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-skylighting revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=88 --- ghc-skylighting.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index b77b679..bfa25dd 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:08:18 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Wed Feb 8 23:11:47 UTC 2023 - Peter Simons