From 6c9f481e698104fc0943202164e2d258e30ea2274abfe44bdb31b623a279a8f8 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-core revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=72 --- ghc-skylighting-core.changes | 12 ++++++++ ghc-skylighting-core.spec | 51 ++++++++++++++++++++++++++++++-- skylighting-core-0.13.2.1.tar.gz | 3 ++ skylighting-core-0.13.2.tar.gz | 3 -- 4 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 skylighting-core-0.13.2.1.tar.gz delete mode 100644 skylighting-core-0.13.2.tar.gz diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index 0b19e2c..4e06e93 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 8 23:11:31 UTC 2023 - Peter Simons + +- Update skylighting-core 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:29 UTC 2022 - Peter Simons diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 91115f3..6b44b9a 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-skylighting-core # -# 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,9 +17,10 @@ %global pkg_name skylighting-core +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.2 +Version: 0.13.2.1 Release: 0 Summary: Syntax highlighting library License: BSD-3-Clause @@ -27,31 +28,56 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel +BuildRequires: ghc-aeson-prof BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-devel +BuildRequires: ghc-binary-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-colour-devel +BuildRequires: ghc-colour-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-mtl-devel +BuildRequires: ghc-mtl-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel +BuildRequires: ghc-safe-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof BuildRequires: ghc-utf8-string-devel +BuildRequires: ghc-utf8-string-prof BuildRequires: ghc-xml-conduit-devel +BuildRequires: ghc-xml-conduit-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-Diff-devel +BuildRequires: ghc-Diff-prof BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-pretty-show-devel +BuildRequires: ghc-pretty-show-prof BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-golden-prof 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 @@ -74,6 +100,22 @@ Requires(postun): ghc-compiler = %{ghc_version} 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} @@ -98,4 +140,9 @@ 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-core-0.13.2.1.tar.gz b/skylighting-core-0.13.2.1.tar.gz new file mode 100644 index 0000000..a8f2d27 --- /dev/null +++ b/skylighting-core-0.13.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a480809ced173d6572b349a1874a16ff74b42501e4486e4180b41e27024f65c5 +size 807155 diff --git a/skylighting-core-0.13.2.tar.gz b/skylighting-core-0.13.2.tar.gz deleted file mode 100644 index 160682e..0000000 --- a/skylighting-core-0.13.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05156ea0633bf037480a8e21d54af8390c1b227893d0bcb7cd880e69fd739f47 -size 806784 From 3730617d9bddd38b94a27ae6c72598550a6269a73c035fc9e6506163cf62cb73 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-core revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=73 --- ghc-skylighting-core.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index 4e06e93..0e99f64 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.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:31 UTC 2023 - Peter Simons