From b9c5081ed338103e0c6c6f035465e619a67afc71 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 15 Nov 2017 13:16:30 +0000 Subject: [PATCH 01/34] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3eb3f34 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-skylighting + +The ghc-skylighting package \ No newline at end of file From d81427a34592ee98b4eb8a1005d9898af5ff9285 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Nov 2017 14:58:27 +0900 Subject: [PATCH 02/34] import (#1511911) --- .gitignore | 1 + README.md | 3 - ghc-skylighting.spec | 115 +++++++++++++++++++++++++++++++++++ skylighting-regex-pcre.patch | 20 ++++++ sources | 1 + 5 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-skylighting.spec create mode 100644 skylighting-regex-pcre.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb934dc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/skylighting-0.1.1.5.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 3eb3f34..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-skylighting - -The ghc-skylighting package \ No newline at end of file diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec new file mode 100644 index 0000000..db925c8 --- /dev/null +++ b/ghc-skylighting.spec @@ -0,0 +1,115 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name skylighting +%global pkgver %{pkg_name}-%{version} + +%bcond_with tests + +# prof fails on armv7hl and s390x +# prof takes 9-10 hours on aarch64 +%ifarch aarch64 armv7hl s390x +%global without_prof 1 +%endif + +Name: ghc-%{pkg_name} +Version: 0.1.1.5 +Release: 3%{?dist} +Summary: Syntax highlighting library + +License: GPLv2+ +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# use regex-pcre instead of regex-pcre-builtin +Patch0: skylighting-regex-pcre.patch + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hxt-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-regex-pcre-devel +BuildRequires: ghc-safe-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-utf8-string-devel +%if %{with tests} +BuildRequires: ghc-Diff-devel +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-pretty-show-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-hunit-devel +%endif +# End cabal-rpm deps + +%description +Skylighting is a syntax highlighting library with support for over one hundred +languages. It derives its tokenizers from XML syntax definitions used by KDE's +KSyntaxHighlighting framework, so any syntax supported by that framework can be +added. An optional command-line program is provided. Skylighting is intended to +be the successor to highlighting-kate. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkgver} +%patch0 -p1 -b .orig + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files +%doc README.md changelog.md + + +%changelog +* Mon Nov 13 2017 Jens Petersen - 0.1.1.5-3 +- add comment for the regex-pcre patch + +* Fri Nov 10 2017 Jens Petersen - 0.1.1.5-2 +- disable prof on aarch64, armv7hl, and s390 +- build with regex-pcre + +* Tue Nov 7 2017 Fedora Haskell SIG - 0.1.1.5-1 +- spec file generated by cabal-rpm-0.11.2 diff --git a/skylighting-regex-pcre.patch b/skylighting-regex-pcre.patch new file mode 100644 index 0000000..d2d4804 --- /dev/null +++ b/skylighting-regex-pcre.patch @@ -0,0 +1,20 @@ +--- skylighting-0.1.1.5/skylighting.cabal~ 2017-02-03 22:33:39.000000000 +0900 ++++ skylighting-0.1.1.5/skylighting.cabal 2017-11-08 18:31:58.633939694 +0900 +@@ -228,7 +228,7 @@ + mtl, + text, + bytestring, +- regex-pcre-builtin, ++ regex-pcre, + directory, + filepath, + aeson, +@@ -260,7 +260,7 @@ + filepath, + bytestring, + text, +- regex-pcre-builtin, ++ regex-pcre, + safe, + hxt, + utf8-string, diff --git a/sources b/sources new file mode 100644 index 0000000..337a1cc --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (skylighting-0.1.1.5.tar.gz) = 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef From 8f30472cf0504e609c47dbbf5f5c52afba98b0ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 5 Dec 2017 13:51:55 +0900 Subject: [PATCH 03/34] update to 0.3.3.1 allowing prof for all archs --- .gitignore | 1 + ghc-skylighting.spec | 26 ++++++++++++++------------ skylighting-regex-pcre.patch | 20 -------------------- sources | 2 +- 4 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 skylighting-regex-pcre.patch diff --git a/.gitignore b/.gitignore index eb934dc..75a9269 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /skylighting-0.1.1.5.tar.gz +/skylighting-0.3.3.1.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index db925c8..42d1648 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -6,27 +6,21 @@ %bcond_with tests -# prof fails on armv7hl and s390x -# prof takes 9-10 hours on aarch64 -%ifarch aarch64 armv7hl s390x -%global without_prof 1 -%endif - Name: ghc-%{pkg_name} -Version: 0.1.1.5 -Release: 3%{?dist} +Version: 0.3.3.1 +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -# use regex-pcre instead of regex-pcre-builtin -Patch0: skylighting-regex-pcre.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel @@ -61,9 +55,12 @@ be the successor to highlighting-kate. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -72,7 +69,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} -%patch0 -p1 -b .orig +cabal-tweak-flag system-pcre True %build @@ -104,6 +101,11 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Dec 5 2017 Jens Petersen - 0.3.3.1-1 +- update to 0.3.3.1 +- reenable prof everywhere +- use system-pcre flag + * Mon Nov 13 2017 Jens Petersen - 0.1.1.5-3 - add comment for the regex-pcre patch diff --git a/skylighting-regex-pcre.patch b/skylighting-regex-pcre.patch deleted file mode 100644 index d2d4804..0000000 --- a/skylighting-regex-pcre.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- skylighting-0.1.1.5/skylighting.cabal~ 2017-02-03 22:33:39.000000000 +0900 -+++ skylighting-0.1.1.5/skylighting.cabal 2017-11-08 18:31:58.633939694 +0900 -@@ -228,7 +228,7 @@ - mtl, - text, - bytestring, -- regex-pcre-builtin, -+ regex-pcre, - directory, - filepath, - aeson, -@@ -260,7 +260,7 @@ - filepath, - bytestring, - text, -- regex-pcre-builtin, -+ regex-pcre, - safe, - hxt, - utf8-string, diff --git a/sources b/sources index 337a1cc..baadbdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skylighting-0.1.1.5.tar.gz) = 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef +SHA512 (skylighting-0.3.3.1.tar.gz) = 02833e3dd81ad8e17444ae91b5d91e4873b5616f780fb0405375f2be1958fef14561540318a0e4667502936f1de356990dcbb7a190e1b9480a6e063df38607ab From e28980475fe72ca04212f0396ccc47e021f41fa1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:00 +0100 Subject: [PATCH 04/34] refresh to cabal-rpm-0.12.1 --- ghc-skylighting.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 42d1648..7bf5b8f 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -84,6 +84,12 @@ cabal-tweak-flag system-pcre True %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 23155c2b642cf6f60812e717abdd360bbca3a4b7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:52:29 +0100 Subject: [PATCH 05/34] update to 0.5.0.1 --- .gitignore | 1 + ghc-skylighting.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75a9269..50d9398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /skylighting-0.1.1.5.tar.gz /skylighting-0.3.3.1.tar.gz +/skylighting-0.5.0.1.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 7bf5b8f..f9a732d 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -7,7 +7,7 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.3.1 +Version: 0.5.0.1 Release: 1%{?dist} Summary: Syntax highlighting library @@ -20,6 +20,7 @@ BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel @@ -107,6 +108,9 @@ cabal-tweak-flag system-pcre True %changelog +* Wed Jan 24 2018 Jens Petersen - 0.5.0.1-1 +- update to 0.5.0.1 + * Tue Dec 5 2017 Jens Petersen - 0.3.3.1-1 - update to 0.3.3.1 - reenable prof everywhere diff --git a/sources b/sources index baadbdf..c148a7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skylighting-0.3.3.1.tar.gz) = 02833e3dd81ad8e17444ae91b5d91e4873b5616f780fb0405375f2be1958fef14561540318a0e4667502936f1de356990dcbb7a190e1b9480a6e063df38607ab +SHA512 (skylighting-0.5.0.1.tar.gz) = 74873d26fc29417b7f932753cf845f5a99c4f315170dcfd4bd79ef0b379e58894aba81b4385a351c1a290b0d3ad38db1ede0f40dfa2d24221af8d585ac6cafee From d3ac3248524a984a61f83be7466e7484baca3a73 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:27 +0900 Subject: [PATCH 06/34] drop ldconfig scriptlets --- ghc-skylighting.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index f9a732d..3841b0a 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -85,12 +85,6 @@ cabal-tweak-flag system-pcre True %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From a869b222f037e5c6c624bb474d9b23d6d0cb05b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:09:12 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 3841b0a..04323c8 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -102,6 +102,9 @@ cabal-tweak-flag system-pcre True %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.5.0.1-1 - update to 0.5.0.1 From 456f6a07a66449b228a2cb4eefb7b4060b326239 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:08:02 +0000 Subject: [PATCH 08/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 04323c8..26765ae 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -102,6 +102,9 @@ cabal-tweak-flag system-pcre True %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.5.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From eb14d63880c4288ea9c48d2ae9eace4a5cd85d3c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 00:46:47 +0900 Subject: [PATCH 09/34] newline after %setup for easier patching --- ghc-skylighting.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 26765ae..ea78c1d 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -70,6 +70,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} + cabal-tweak-flag system-pcre True From ae5a1d8f667361d2af96262d5554e616edfe5bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:42:01 +0200 Subject: [PATCH 10/34] Rebuilt for #1607054 --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index ea78c1d..8020b5c 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.5.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -103,6 +103,9 @@ cabal-tweak-flag system-pcre True %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.5.0.1-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.5.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f5ecaaae1869df389c30a5b8c085611ab8886d6b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:44:38 +0900 Subject: [PATCH 11/34] update to 0.6 --- .gitignore | 1 + ghc-skylighting.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 50d9398..9620b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /skylighting-0.1.1.5.tar.gz /skylighting-0.3.3.1.tar.gz /skylighting-0.5.0.1.tar.gz +/skylighting-0.6.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 8020b5c..cc18b83 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.0.1 -Release: 4%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -19,12 +19,14 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel +BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-colour-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel @@ -37,11 +39,13 @@ BuildRequires: ghc-utf8-string-devel %if %{with tests} BuildRequires: ghc-Diff-devel BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-random-devel BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-golden-devel BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps @@ -103,6 +107,9 @@ cabal-tweak-flag system-pcre True %changelog +* Sat Jul 28 2018 Jens Petersen - 0.6-1 +- update to 0.6 + * Mon Jul 23 2018 Miro Hrončok - 0.5.0.1-4 - Rebuilt for #1607054 diff --git a/sources b/sources index c148a7c..7e41622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skylighting-0.5.0.1.tar.gz) = 74873d26fc29417b7f932753cf845f5a99c4f315170dcfd4bd79ef0b379e58894aba81b4385a351c1a290b0d3ad38db1ede0f40dfa2d24221af8d585ac6cafee +SHA512 (skylighting-0.6.tar.gz) = a28886deed006406de570d4ae065b43d0b8b66c743932ed62d33454caee3cf1d8433f70623a02489c0034b413cd021075122d1baf7b3f1b6e7b3deeb325bff00 From 8d3867dc61455d92949b9a4e1a638fa782a9c8b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:00:46 +0000 Subject: [PATCH 12/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index cc18b83..6f46ec1 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -107,6 +107,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.6-1 - update to 0.6 From 14e08aa878aed22b4c31a2182f216bf1efcf1a8a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:09 +0800 Subject: [PATCH 13/34] refresh to cabal-rpm-0.13 --- ghc-skylighting.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 6f46ec1..7cee67d 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syntax highlighting library License: GPLv2+ Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-attoparsec-devel @@ -73,17 +75,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} - +# End cabal-rpm setup cabal-tweak-flag system-pcre True %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -99,7 +106,9 @@ cabal-tweak-flag system-pcre True %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -107,6 +116,9 @@ cabal-tweak-flag system-pcre True %changelog +* Sun Feb 17 2019 Jens Petersen - 0.6-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 672b6cc04dd447b52a28e42d464b18abcef2ffd7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 12:18:13 +0800 Subject: [PATCH 14/34] update to 0.7.5 --- .gitignore | 1 + ghc-skylighting.spec | 29 +++++++++-------------------- sources | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 9620b2d..3b5147c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /skylighting-0.3.3.1.tar.gz /skylighting-0.5.0.1.tar.gz /skylighting-0.6.tar.gz +/skylighting-0.7.5.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 7cee67d..5d11ee7 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,11 +4,9 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} -Version: 0.6 -Release: 3%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -36,19 +34,9 @@ BuildRequires: ghc-hxt-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-regex-pcre-devel BuildRequires: ghc-safe-devel +BuildRequires: ghc-skylighting-core-devel BuildRequires: ghc-text-devel BuildRequires: ghc-utf8-string-devel -%if %{with tests} -BuildRequires: ghc-Diff-devel -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-pretty-show-devel -BuildRequires: ghc-random-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-golden-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -%endif # End cabal-rpm deps %description @@ -56,7 +44,9 @@ Skylighting is a syntax highlighting library with support for over one hundred languages. It derives its tokenizers from XML syntax definitions used by KDE's KSyntaxHighlighting framework, so any syntax supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to -be the successor to highlighting-kate. +be the successor to highlighting-kate. This package provides generated syntax +modules based on the KDE XML definitions provided by the 'skylighting-core' +package. As a result this package is licensed under the GPL. %package devel @@ -93,10 +83,6 @@ cabal-tweak-flag system-pcre True # End cabal-rpm install -%check -%cabal_test - - %post devel %ghc_pkg_recache @@ -116,6 +102,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Feb 21 2019 Jens Petersen - 0.7.5-1 +- update to 0.7.5 + * Sun Feb 17 2019 Jens Petersen - 0.6-3 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 7e41622..a2cb5f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skylighting-0.6.tar.gz) = a28886deed006406de570d4ae065b43d0b8b66c743932ed62d33454caee3cf1d8433f70623a02489c0034b413cd021075122d1baf7b3f1b6e7b3deeb325bff00 +SHA512 (skylighting-0.7.5.tar.gz) = 67b5b5fa4688d9d3f66a92d35c27bd394c3f63ea9033ee72491d7e34b8fc8526b0bf44d3c3956ac0d49dda00d9edc36458b8a07a4e7037e8629abb55b30aa8d0 From 6d4004c11667fcd9f533607b6c291e8124b9c586 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 24 Feb 2019 23:03:24 +0800 Subject: [PATCH 15/34] subpackage core library --- .gitignore | 1 + ghc-skylighting.spec | 25 ++++++++++++++++++++++--- sources | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3b5147c..d4d0bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /skylighting-0.5.0.1.tar.gz /skylighting-0.6.tar.gz /skylighting-0.7.5.tar.gz +/skylighting-core-0.7.5.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 5d11ee7..155b988 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,8 +4,12 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} +%global skylightingcore skylighting-core-0.7.5 +%global subpkgs %{skylightingcore} + Name: ghc-%{pkg_name} Version: 0.7.5 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Syntax highlighting library @@ -13,11 +17,13 @@ License: GPLv2+ 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 # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-attoparsec-devel @@ -34,7 +40,7 @@ BuildRequires: ghc-hxt-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-regex-pcre-devel BuildRequires: ghc-safe-devel -BuildRequires: ghc-skylighting-core-devel +#BuildRequires: ghc-skylighting-core-devel BuildRequires: ghc-text-devel BuildRequires: ghc-utf8-string-devel # End cabal-rpm deps @@ -64,22 +70,34 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{skylightingcore} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup cabal-tweak-flag system-pcre True %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -104,6 +122,7 @@ cabal-tweak-flag system-pcre True %changelog * Thu Feb 21 2019 Jens Petersen - 0.7.5-1 - update to 0.7.5 +- subpackage skylightlighting-core * Sun Feb 17 2019 Jens Petersen - 0.6-3 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index a2cb5f8..2017a52 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (skylighting-0.7.5.tar.gz) = 67b5b5fa4688d9d3f66a92d35c27bd394c3f63ea9033ee72491d7e34b8fc8526b0bf44d3c3956ac0d49dda00d9edc36458b8a07a4e7037e8629abb55b30aa8d0 +SHA512 (skylighting-core-0.7.5.tar.gz) = e86fae8b77426d960f2095d5d2e70f676ff085f0409a9306fe69ccdf1739a2b5aee844b8db070e6afc49a2a2e77b19018e78ea85e85a5e3ded9ee12161eefbb6 From ea8c4c2f15b0a2deb97edbf7f9ac1b791ebaa86e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:00:35 +0000 Subject: [PATCH 16/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 155b988..bfa7c6a 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.7.5 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -120,6 +120,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 0.7.5-1 - update to 0.7.5 - subpackage skylightlighting-core From 4f586c1f2b8eb4d5aca5a6dd3b7477162b1b87db Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:25:53 +0000 Subject: [PATCH 17/34] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-skylighting.spec | 48 +++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index bfa7c6a..3758aca 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -22,6 +22,12 @@ Source1: https://hackage.haskell.org/package/%{skylightingcore}/%{skyligh # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros-extra BuildRequires: chrpath BuildRequires: ghc-aeson-devel @@ -58,11 +64,8 @@ package. As a result this package is licensed under the GPL. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -70,6 +73,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %global main_version %{version} %if %{defined ghclibdir} @@ -101,14 +123,6 @@ cabal-tweak-flag system-pcre True # End cabal-rpm install -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -119,6 +133,16 @@ cabal-tweak-flag system-pcre True %doc README.md changelog.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 0.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 89312431a49ca4e43d8daaf32a391ac6a2198e31 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 16:38:22 +0000 Subject: [PATCH 18/34] update to 0.7.7 --- .gitignore | 2 ++ ghc-skylighting.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d4d0bd8..d157516 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /skylighting-0.6.tar.gz /skylighting-0.7.5.tar.gz /skylighting-core-0.7.5.tar.gz +/skylighting-0.7.7.tar.gz +/skylighting-core-0.7.7.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 3758aca..d8e8f92 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,13 +4,13 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.7.5 +%global skylightingcore skylighting-core-0.7.7 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.7.5 +Version: 0.7.7 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -144,6 +144,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Jul 25 2019 Jens Petersen - 0.7.7-3 +- update to 0.7.7 + * Thu Jul 25 2019 Fedora Release Engineering - 0.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2017a52..e389451 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-0.7.5.tar.gz) = 67b5b5fa4688d9d3f66a92d35c27bd394c3f63ea9033ee72491d7e34b8fc8526b0bf44d3c3956ac0d49dda00d9edc36458b8a07a4e7037e8629abb55b30aa8d0 -SHA512 (skylighting-core-0.7.5.tar.gz) = e86fae8b77426d960f2095d5d2e70f676ff085f0409a9306fe69ccdf1739a2b5aee844b8db070e6afc49a2a2e77b19018e78ea85e85a5e3ded9ee12161eefbb6 +SHA512 (skylighting-0.7.7.tar.gz) = 807fd86548fcc0c20869c6cf38b5b8c1498af5622d000200bee11ae4ce3df8d05353b8902215f9d914204a041344f33bcd59acc4446a1d4a2a4f82d45ece2fde +SHA512 (skylighting-core-0.7.7.tar.gz) = 88ab8e50b094154069f493dcc4091bb7ac875ba9be2d90f1b22ac8bc9f4c1b556101eba96f098659f581dbf609d6b5df82a604fd31fdfb2c3cdfa3f792dd5bbd From 9514ffa9371203008e044d0d7a81241650c0a695 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:31:52 +0800 Subject: [PATCH 19/34] BR prof for lib and static for executable --- ghc-skylighting.spec | 48 ++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index d8e8f92..4d0af25 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -22,33 +22,28 @@ Source1: https://hackage.haskell.org/package/%{skylightingcore}/%{skyligh # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-ansi-terminal-prof +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-blaze-html-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-case-insensitive-prof +BuildRequires: ghc-colour-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-directory-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-hxt-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-regex-pcre-prof +BuildRequires: ghc-safe-prof +#BuildRequires: ghc-skylighting-core-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-utf8-string-prof BuildRequires: chrpath -BuildRequires: ghc-aeson-devel -BuildRequires: ghc-ansi-terminal-devel -BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-base64-bytestring-devel -BuildRequires: ghc-binary-devel -BuildRequires: ghc-blaze-html-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-case-insensitive-devel -BuildRequires: ghc-colour-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-hxt-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-regex-pcre-devel -BuildRequires: ghc-safe-devel -#BuildRequires: ghc-skylighting-core-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-utf8-string-devel # End cabal-rpm deps %description @@ -64,6 +59,7 @@ package. As a result this package is licensed under the GPL. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From 5d90c0d4f23bc27cf57cb853a641cd97a118366b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:23:31 +0000 Subject: [PATCH 20/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 4d0af25..baf3036 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.7.7 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -140,6 +140,9 @@ cabal-tweak-flag system-pcre True %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.7.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 0.7.7-3 - update to 0.7.7 From f62c01f0275bdba45c6414c2a266819e22287154 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 00:09:24 +0800 Subject: [PATCH 21/34] refresh to cabal-rpm-2.0.2 --- ghc-skylighting.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index baf3036..7bc1421 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 --subpackage +# generated by cabal-rpm-2.0.2 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name skylighting @@ -43,7 +43,9 @@ BuildRequires: ghc-safe-prof #BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-text-prof BuildRequires: ghc-utf8-string-prof -BuildRequires: chrpath +# for missing dep 'skylighting-core': +#BuildRequires: ghc-regex-pcre-builtin-prof +BuildRequires: ghc-transformers-prof # End cabal-rpm deps %description @@ -72,6 +74,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -82,6 +85,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -119,6 +123,16 @@ cabal-tweak-flag system-pcre True # End cabal-rpm install +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -131,6 +145,7 @@ cabal-tweak-flag system-pcre True %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 2beed14a30cf3c78ea82ec6ab691a8c47d6b94eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:00:24 +0800 Subject: [PATCH 22/34] update to 0.8.2.1 --- .gitignore | 2 ++ ghc-skylighting.spec | 28 +++++++++++++++++----------- sources | 4 ++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d157516..0021baf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /skylighting-core-0.7.5.tar.gz /skylighting-0.7.7.tar.gz /skylighting-core-0.7.7.tar.gz +/skylighting-0.8.2.1.tar.gz +/skylighting-core-0.8.2.1.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 7bc1421..39d39a9 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,13 +4,13 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.7.7 +%global skylightingcore skylighting-core-0.8.2.1 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.7.7 +Version: 0.8.2.1 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -23,29 +23,29 @@ Source1: https://hackage.haskell.org/package/%{skylightingcore}/%{skyligh # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +#BuildRequires: ghc-skylighting-core-prof +# for missing dep 'skylighting-core': BuildRequires: ghc-aeson-prof BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof -BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof -BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-colour-prof -BuildRequires: ghc-containers-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-hxt-prof BuildRequires: ghc-mtl-prof +BuildRequires: ghc-regex-base-prof BuildRequires: ghc-regex-pcre-prof BuildRequires: ghc-safe-prof -#BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-text-prof -BuildRequires: ghc-utf8-string-prof -# for missing dep 'skylighting-core': -#BuildRequires: ghc-regex-pcre-builtin-prof BuildRequires: ghc-transformers-prof +BuildRequires: ghc-utf8-string-prof # End cabal-rpm deps %description @@ -105,7 +105,10 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} -a1 # End cabal-rpm setup +( +cd %{skylightingcore} cabal-tweak-flag system-pcre True +) %build @@ -155,6 +158,9 @@ cabal-tweak-flag system-pcre True %changelog +* Fri Feb 14 2020 Jens Petersen - 0.8.2.1-5 +- update to 0.8.2.1 + * Tue Jan 28 2020 Fedora Release Engineering - 0.7.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e389451..69dc043 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-0.7.7.tar.gz) = 807fd86548fcc0c20869c6cf38b5b8c1498af5622d000200bee11ae4ce3df8d05353b8902215f9d914204a041344f33bcd59acc4446a1d4a2a4f82d45ece2fde -SHA512 (skylighting-core-0.7.7.tar.gz) = 88ab8e50b094154069f493dcc4091bb7ac875ba9be2d90f1b22ac8bc9f4c1b556101eba96f098659f581dbf609d6b5df82a604fd31fdfb2c3cdfa3f792dd5bbd +SHA512 (skylighting-0.8.2.1.tar.gz) = b114fdde25ce67ae8e9a7cecf0d2e413fab2696152b3959dd79515af65fc0e5d23e22b0e0c3052088578cb8f774b805acaeb1d384aeb031acf916694b3655605 +SHA512 (skylighting-core-0.8.2.1.tar.gz) = 0eb5f967e21a08a89a9f4eb939dbb2b1ac005c3bec669bf60c6dd69f1b1f3f50dfbc1a2a4dfbe0633b54ca8e751e0b78f755a31d7f1783dc1fcc5f92321dc749 From 9d71114e4b099b0fae699e5ae24f7d88a47cfec1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:18 +0800 Subject: [PATCH 23/34] refresh to cabal-rpm-2.0.5 --- ghc-skylighting.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 39d39a9..1ccc8cd 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 --subpackage -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} From d0130047c986ac85c6c9f4ca30cc96ad7eda09cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:51:14 +0800 Subject: [PATCH 24/34] update to 0.8.4 --- .gitignore | 1 + ghc-skylighting.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0021baf..530c52b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /skylighting-core-0.7.7.tar.gz /skylighting-0.8.2.1.tar.gz /skylighting-core-0.8.2.1.tar.gz +/skylighting-0.8.4.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 1ccc8cd..9699a4d 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,13 +4,13 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.8.2.1 +%global skylightingcore skylighting-core-0.8.4 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.8.2.1 +Version: 0.8.4 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -40,7 +40,6 @@ BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-hxt-prof BuildRequires: ghc-mtl-prof -BuildRequires: ghc-regex-base-prof BuildRequires: ghc-regex-pcre-prof BuildRequires: ghc-safe-prof BuildRequires: ghc-text-prof @@ -158,6 +157,9 @@ cabal-tweak-flag system-pcre True %changelog +* Wed Jun 10 2020 Jens Petersen - 0.8.4-2 +- update to 0.8.4 + * Fri Feb 14 2020 Jens Petersen - 0.8.2.1-5 - update to 0.8.2.1 diff --git a/sources b/sources index 69dc043..456b245 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-0.8.2.1.tar.gz) = b114fdde25ce67ae8e9a7cecf0d2e413fab2696152b3959dd79515af65fc0e5d23e22b0e0c3052088578cb8f774b805acaeb1d384aeb031acf916694b3655605 SHA512 (skylighting-core-0.8.2.1.tar.gz) = 0eb5f967e21a08a89a9f4eb939dbb2b1ac005c3bec669bf60c6dd69f1b1f3f50dfbc1a2a4dfbe0633b54ca8e751e0b78f755a31d7f1783dc1fcc5f92321dc749 +SHA512 (skylighting-0.8.4.tar.gz) = 5c0e2605ddc4dd21dba036bc2c010ab2e2be930580921fb13146999b259e5ccd5599c504b7e31adf9d9f9d03af36c05965672de6864a0375ac13a7d372f00498 From b76ada160460fea183604e60ec97d39e2bf26f15 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:55 +0800 Subject: [PATCH 25/34] refresh to cabal-rpm-2.0.6 --- ghc-skylighting.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 9699a4d..5365f9a 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name skylighting @@ -125,16 +125,6 @@ cabal-tweak-flag system-pcre True # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 31e4efb9f48d0b080a47f3fdf20c49b4b8a467a6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jul 2020 19:57:53 +0800 Subject: [PATCH 26/34] update to 0.8.5 --- .gitignore | 2 ++ ghc-skylighting.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 530c52b..22b2831 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /skylighting-0.8.2.1.tar.gz /skylighting-core-0.8.2.1.tar.gz /skylighting-0.8.4.tar.gz +/skylighting-0.8.5.tar.gz +/skylighting-core-0.8.5.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 5365f9a..2ee1e9a 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -4,13 +4,13 @@ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.8.4 +%global skylightingcore skylighting-core-0.8.5 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.8.4 +Version: 0.8.5 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -147,6 +147,9 @@ cabal-tweak-flag system-pcre True %changelog +* Fri Jul 17 2020 Jens Petersen - 0.8.5-1 +- update to 0.8.5 + * Wed Jun 10 2020 Jens Petersen - 0.8.4-2 - update to 0.8.4 diff --git a/sources b/sources index 456b245..d9b6f11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-core-0.8.2.1.tar.gz) = 0eb5f967e21a08a89a9f4eb939dbb2b1ac005c3bec669bf60c6dd69f1b1f3f50dfbc1a2a4dfbe0633b54ca8e751e0b78f755a31d7f1783dc1fcc5f92321dc749 -SHA512 (skylighting-0.8.4.tar.gz) = 5c0e2605ddc4dd21dba036bc2c010ab2e2be930580921fb13146999b259e5ccd5599c504b7e31adf9d9f9d03af36c05965672de6864a0375ac13a7d372f00498 +SHA512 (skylighting-0.8.5.tar.gz) = 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f +SHA512 (skylighting-core-0.8.5.tar.gz) = ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257 From a85c65f9131675c8d203dd2709998a56949b0fa5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:40:17 +0000 Subject: [PATCH 27/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 2ee1e9a..518504a 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -147,6 +147,9 @@ cabal-tweak-flag system-pcre True %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.8.5-1 - update to 0.8.5 From 02de987099a03426319a21c6a64677a3369d8ba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:29:36 +0000 Subject: [PATCH 28/34] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 518504a..e1af97d 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -147,6 +147,10 @@ cabal-tweak-flag system-pcre True %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.8.5-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2dd3e933553e47cc01c4a49a2d300563ad69e1e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:44:13 +0000 Subject: [PATCH 29/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index e1af97d..29735d3 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -147,6 +147,9 @@ cabal-tweak-flag system-pcre True %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.8.5-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aa6b0ad81ffa02c55722f72178bcd51cc9ed1fad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:15:36 +0000 Subject: [PATCH 30/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 29735d3..4ccaa66 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -147,6 +147,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8418820eaf94e18724f947103daa091d06d7c2ed Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:48:25 +0800 Subject: [PATCH 31/34] update to 0.10.2 --- .gitignore | 2 ++ ghc-skylighting.spec | 17 ++++++++--------- sources | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 22b2831..c8102f5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /skylighting-0.8.4.tar.gz /skylighting-0.8.5.tar.gz /skylighting-core-0.8.5.tar.gz +/skylighting-0.10.2.tar.gz +/skylighting-core-0.10.2.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 4ccaa66..bb65436 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,14 +1,14 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name skylighting %global pkgver %{pkg_name}-%{version} -%global skylightingcore skylighting-core-0.8.5 +%global skylightingcore skylighting-core-0.10.5.1 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.8.5 +Version: 0.10.2 # can only be reset when all subpkgs bumped Release: 5%{?dist} Summary: Syntax highlighting library @@ -38,13 +38,12 @@ BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-colour-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-filepath-prof -BuildRequires: ghc-hxt-prof BuildRequires: ghc-mtl-prof -BuildRequires: ghc-regex-pcre-prof BuildRequires: ghc-safe-prof BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-utf8-string-prof +BuildRequires: ghc-xml-conduit-prof # End cabal-rpm deps %description @@ -74,6 +73,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -104,10 +104,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} -a1 # End cabal-rpm setup -( -cd %{skylightingcore} -cabal-tweak-flag system-pcre True -) %build @@ -147,6 +143,9 @@ cabal-tweak-flag system-pcre True %changelog +* Thu Aug 5 2021 Jens Petersen - 0.10.2-5 +- update to 0.10.2 + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index d9b6f11..6f9144a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-0.8.5.tar.gz) = 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f -SHA512 (skylighting-core-0.8.5.tar.gz) = ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257 +SHA512 (skylighting-core-0.10.2.tar.gz) = c3d20694b29dee660cbba681dec4b7610b1b5be8e5b359931935b0e2a466f41a494847231557c6c5906d5b31487360516af0e00c46689cbc03c9de58e3430698 +SHA512 (skylighting-0.10.2.tar.gz) = 04d411580caf6102e3f8732c53b103412c6d42becfadbbcdd13053557235b632f07d82b22acad87ffc37f5705a387367aa21a0b70b1c5cf2ef52acce1b3e4e86 From 5d1ae9bdac1988b8101e7a3f57c0bd54a4ee1de6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:49:08 +0800 Subject: [PATCH 32/34] update to 0.10.5.2 --- .gitignore | 2 ++ ghc-skylighting.spec | 14 ++++++++------ sources | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c8102f5..3bce4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /skylighting-core-0.8.5.tar.gz /skylighting-0.10.2.tar.gz /skylighting-core-0.10.2.tar.gz +/skylighting-0.10.5.2.tar.gz +/skylighting-core-0.10.5.2.tar.gz diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index bb65436..dae3694 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,16 +1,16 @@ -# generated by cabal-rpm-2.0.9 --subpackage +# generated by cabal-rpm-2.0.10 --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.1 +%global skylightingcore skylighting-core-0.10.5.2 %global subpkgs %{skylightingcore} Name: ghc-%{pkg_name} -Version: 0.10.2 +Version: 0.10.5.2 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 1%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -25,7 +25,6 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-base-prof BuildRequires: ghc-binary-prof -BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof #BuildRequires: ghc-skylighting-core-prof # for missing dep 'skylighting-core': @@ -34,6 +33,7 @@ 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 BuildRequires: ghc-directory-prof @@ -117,7 +117,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -143,6 +142,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.10.5.2-6 +- update to 0.10.5.2 + * Thu Aug 5 2021 Jens Petersen - 0.10.2-5 - update to 0.10.2 diff --git a/sources b/sources index 6f9144a..8b4f805 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (skylighting-core-0.10.2.tar.gz) = c3d20694b29dee660cbba681dec4b7610b1b5be8e5b359931935b0e2a466f41a494847231557c6c5906d5b31487360516af0e00c46689cbc03c9de58e3430698 -SHA512 (skylighting-0.10.2.tar.gz) = 04d411580caf6102e3f8732c53b103412c6d42becfadbbcdd13053557235b632f07d82b22acad87ffc37f5705a387367aa21a0b70b1c5cf2ef52acce1b3e4e86 +SHA512 (skylighting-core-0.10.5.2.tar.gz) = c8cd61c20d758f0b9bef03a6d36bbfeb83e1b355040198044764a14d5cbbae93cdea1ef2cd56f9c482e20c5b657fb201231c28f728c2a0ad0aae6354c678a917 +SHA512 (skylighting-0.10.5.2.tar.gz) = 00799f7058312d38f8d1cd753eab25c0abc0461bf1137de606c52509a608e9594b4aa94e01c53f6ed2effffc83496cec2ce71c478709c88f9a1affc49112bb7c From 87b5ac315c4d227e25f4650f1e2f4e667a452259 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:32:58 +0000 Subject: [PATCH 33/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-skylighting.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index dae3694..09c2597 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.10.5.2 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Syntax highlighting library License: GPLv2+ @@ -142,6 +142,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.10.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.10.5.2-6 - update to 0.10.5.2 From 9a2730aca554c6a29b5abeae2a489e3154e78f73 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:55:44 +0300 Subject: [PATCH 34/34] Remove unnecessary files --- sources | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 8b4f805..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (skylighting-core-0.10.5.2.tar.gz) = c8cd61c20d758f0b9bef03a6d36bbfeb83e1b355040198044764a14d5cbbae93cdea1ef2cd56f9c482e20c5b657fb201231c28f728c2a0ad0aae6354c678a917 -SHA512 (skylighting-0.10.5.2.tar.gz) = 00799f7058312d38f8d1cd753eab25c0abc0461bf1137de606c52509a608e9594b4aa94e01c53f6ed2effffc83496cec2ce71c478709c88f9a1affc49112bb7c