From a7e03b515b1b6456137a95845afa8afd857db763 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 25 Jan 2015 21:42:32 +0000 Subject: [PATCH 01/38] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 989faf1589b2dcce7bad10f57966c54f10e2f1ce Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 10:26:51 +0900 Subject: [PATCH 02/38] import (#1182435) --- .gitignore | 1 + ghc-haddock-library.spec | 92 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 94 insertions(+) create mode 100644 ghc-haddock-library.spec diff --git a/.gitignore b/.gitignore index e69de29..29af34f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/haddock-library-1.1.1.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec new file mode 100644 index 0000000..27dcb0f --- /dev/null +++ b/ghc-haddock-library.spec @@ -0,0 +1,92 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name haddock-library + +%bcond_with tests + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 1.1.1 +Release: 1%{?dist} +Summary: Library exposing some functionality of Haddock + +License: BSD +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-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-deepseq-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-hspec-devel +%endif +# End cabal-rpm deps + +%description +Haddock is a documentation-generation tool for Haskell libraries. +These modules expose some functionality of it without pulling in the GHC +dependency. Please note that the API is likely to change so specify upper +bounds in your project if you can't release often. For interacting with Haddock +itself, see the ‘haddock’ package. + + +%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 %{pkg_name}-%{version} + + +%build +# for "dist/doc/html/haddock-library/haddock-prolog7045.txt: invalid argument" +LANG=en_US.utf8 +%ghc_lib_build + + +%install +%ghc_lib_install + + +%check +%if %{with tests} +%cabal test +%endif + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files + + +%changelog +* Thu Jan 15 2015 Jens Petersen - 1.1.1-1 +- use utf8 for build to avoid error with haddock-prolog7045.txt + +* Thu Jan 15 2015 Fedora Haskell SIG - 1.1.1 +- spec file generated by cabal-rpm-0.9.2 diff --git a/sources b/sources index e69de29..6343891 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +43b0f7a9eb4a86056e1b3eaaf9394b6d haddock-library-1.1.1.tar.gz From d0f72e49b8e2ffa8faea0005715413477008dc4d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:44:11 +0000 Subject: [PATCH 03/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 27dcb0f..6a91a41 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -85,6 +85,9 @@ LANG=en_US.utf8 %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jan 15 2015 Jens Petersen - 1.1.1-1 - use utf8 for build to avoid error with haddock-prolog7045.txt From 0a925d2146d75121d9222d362bf315a9a459f5a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 18:54:27 +0900 Subject: [PATCH 04/38] update to 1.2.1 --- .gitignore | 1 + ghc-haddock-library.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 29af34f..c3cdb25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /haddock-library-1.1.1.tar.gz +/haddock-library-1.2.1.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 6a91a41..6a659dd 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -4,12 +4,9 @@ %bcond_with tests -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -21,6 +18,7 @@ BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel @@ -54,14 +52,14 @@ files. %build -# for "dist/doc/html/haddock-library/haddock-prolog7045.txt: invalid argument" -LANG=en_US.utf8 %ghc_lib_build %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -78,13 +76,16 @@ LANG=en_US.utf8 %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Sep 17 2015 Jens Petersen - 1.2.1-1 +- update to 1.2.1 + * Wed Jun 17 2015 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 6343891..130b25e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b0f7a9eb4a86056e1b3eaaf9394b6d haddock-library-1.1.1.tar.gz +87ac6bd48bbaa26a993248f00fa69b17 haddock-library-1.2.1.tar.gz From a5e96af56f47f8c7b36ba866fb90af823f764117 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:33:34 +0000 Subject: [PATCH 05/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 6a659dd..c400fb8 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -83,6 +83,9 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Sep 17 2015 Jens Petersen - 1.2.1-1 - update to 1.2.1 From ccb66e634fb8ca23638f0c96fed8ed8530847a49 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:36 +0900 Subject: [PATCH 06/38] no longer remove license; use cabal_test --- ghc-haddock-library.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index c400fb8..54f7232 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -58,13 +58,9 @@ files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From 56c235b5042cfbababde6d56f73c7433dc54cd82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:40:21 +0000 Subject: [PATCH 07/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 54f7232..76dc529 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -79,6 +79,9 @@ files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b39fb12e9da994f2ee00fa023e56e4d0cfc734b7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 10:53:34 +0900 Subject: [PATCH 08/38] update to 1.4.2 --- .gitignore | 1 + ghc-haddock-library.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c3cdb25..f9f1539 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /haddock-library-1.1.1.tar.gz /haddock-library-1.2.1.tar.gz +/haddock-library-1.4.2.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 76dc529..b9aae94 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,17 +1,19 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haddock-library +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -48,7 +50,7 @@ files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -79,6 +81,9 @@ files. %changelog +* Wed Feb 22 2017 Jens Petersen - 1.4.2-1 +- update to 1.4.2 + * Fri Feb 10 2017 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 130b25e..b5926c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87ac6bd48bbaa26a993248f00fa69b17 haddock-library-1.2.1.tar.gz +SHA512 (haddock-library-1.4.2.tar.gz) = 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82 From b9a7d4a767eddadebd47712209bab610e9bc6b68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:44:03 +0000 Subject: [PATCH 09/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index b9aae94..aab162b 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -81,6 +81,9 @@ files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 1.4.2-1 - update to 1.4.2 From 55ff52d990c132ad09b0c5549820be953d1ac145 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:21:12 +0000 Subject: [PATCH 10/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index aab162b..3ba14bd 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -81,6 +81,9 @@ files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 72ac8b824e6d17af35372d98477271ce2ea85cdd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:11:13 +0100 Subject: [PATCH 11/38] refresh to cabal-rpm-0.12.1 --- ghc-haddock-library.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 3ba14bd..e86c9c8 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haddock-library @@ -39,9 +39,12 @@ itself, see the ‘haddock’ package. %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 @@ -65,6 +68,12 @@ files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From e029a8b99fb899213e825bf7b36c2963c241d1d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:33:40 +0100 Subject: [PATCH 12/38] update to 1.4.3 --- .gitignore | 1 + ghc-haddock-library.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9f1539..f392368 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /haddock-library-1.1.1.tar.gz /haddock-library-1.2.1.tar.gz /haddock-library-1.4.2.tar.gz +/haddock-library-1.4.3.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index e86c9c8..d6a1504 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.4.2 -Release: 3%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -90,6 +90,9 @@ files. %changelog +* Wed Jan 24 2018 Jens Petersen - 1.4.3-1 +- update to 1.4.3 + * Wed Aug 02 2017 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index b5926c9..f4b8aed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.4.2.tar.gz) = 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82 +SHA512 (haddock-library-1.4.3.tar.gz) = 33cd93c76f005567c88d913ce80fd3f0f3af0227bf3e2986eb59f9ec25168c6dc4dcff54a876c7148c20cb25e072c7d920245609cc7384dc22e1cc0b502c61c9 From b6a8b4d696b41db3e93f4f0f9b9dc863ca20dfd1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:37 +0900 Subject: [PATCH 13/38] drop ldconfig scriptlets --- ghc-haddock-library.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index d6a1504..6eb5709 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -68,12 +68,6 @@ files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 7473148838738d03ed80225774c298da1213e131 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:41:34 +0000 Subject: [PATCH 14/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 6eb5709..474fd83 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -84,6 +84,9 @@ files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 1.4.3-1 - update to 1.4.3 From 3dcbf6d5d31147be97c47d176dffcb3af5b46542 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:49:55 +0000 Subject: [PATCH 15/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 474fd83..75f8708 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -84,6 +84,9 @@ files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 3e61664b344658d1ddae9b4110d34da16afa6319 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 23:06:34 +0900 Subject: [PATCH 16/38] update to 1.4.5 --- .gitignore | 1 + ghc-haddock-library.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f392368..03deead 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /haddock-library-1.2.1.tar.gz /haddock-library-1.4.2.tar.gz /haddock-library-1.4.3.tar.gz +/haddock-library-1.4.5.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 75f8708..9b9d23a 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.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 haddock-library @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -18,6 +18,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-transformers-devel @@ -81,9 +82,13 @@ files. %files devel -f %{name}-devel.files +%doc CHANGES.md %changelog +* Sun Jul 22 2018 Jens Petersen - 1.4.5-1 +- update to 1.4.5 + * Fri Jul 13 2018 Fedora Release Engineering - 1.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f4b8aed..587e848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.4.3.tar.gz) = 33cd93c76f005567c88d913ce80fd3f0f3af0227bf3e2986eb59f9ec25168c6dc4dcff54a876c7148c20cb25e072c7d920245609cc7384dc22e1cc0b502c61c9 +SHA512 (haddock-library-1.4.5.tar.gz) = 5ba3152996d64bf4a41e3c791e8a657b8a9353ddde7ebdee5e2c60a4a4498cba9e0105ecb98107769a68cdc55109bd6087acdf124577c5b3dab2d3e24c0f40c9 From 1594d006c1165d7d04e968e9592d2da1c1dde114 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 30 Jul 2018 17:35:21 +0900 Subject: [PATCH 17/38] disable haddock due to internal library --- ghc-haddock-library.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 9b9d23a..a1107f1 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -6,6 +6,9 @@ %bcond_with tests +# haddock breaks with internal libraries +%global without_haddock 1 + Name: ghc-%{pkg_name} Version: 1.4.5 Release: 1%{?dist} @@ -88,6 +91,7 @@ files. %changelog * Sun Jul 22 2018 Jens Petersen - 1.4.5-1 - update to 1.4.5 +- disable haddock generation due to internal library * Fri Jul 13 2018 Fedora Release Engineering - 1.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 71b4e13893867fc89bf1efa264617c08c77db01f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:34:46 +0000 Subject: [PATCH 18/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index a1107f1..ebeeb73 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -89,6 +89,9 @@ files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 1.4.5-1 - update to 1.4.5 - disable haddock generation due to internal library From 8356a4a1141e0cbb2595ec45b91a3b08b73d1d98 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:44:57 +0800 Subject: [PATCH 19/38] refresh to cabal-rpm-0.13 --- ghc-haddock-library.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index ebeeb73..210b810 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.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 haddock-library @@ -11,16 +11,18 @@ Name: ghc-%{pkg_name} Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library exposing some functionality of Haddock License: BSD 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-attoparsec-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel @@ -57,15 +59,21 @@ files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %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 @@ -81,7 +89,9 @@ files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -89,6 +99,9 @@ files. %changelog +* Sun Feb 17 2019 Jens Petersen - 1.4.5-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 1.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9b5ad8e3eb25d8b37cd3cdd2bdd806b02f775399 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 10:24:09 +0800 Subject: [PATCH 20/38] update to 1.5.0.1 --- .gitignore | 1 + ghc-haddock-library.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 03deead..1d8bd9e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /haddock-library-1.4.2.tar.gz /haddock-library-1.4.3.tar.gz /haddock-library-1.4.5.tar.gz +/haddock-library-1.5.0.1.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 210b810..60ddb72 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -10,8 +10,8 @@ %global without_haddock 1 Name: ghc-%{pkg_name} -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.5.0.1 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -25,12 +25,17 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-tree-diff-devel %endif # End cabal-rpm deps @@ -91,6 +96,7 @@ files. %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE +%license vendor/attoparsec-0.13.1.0/LICENSE # End cabal-rpm files @@ -99,6 +105,9 @@ files. %changelog +* Thu Feb 21 2019 Jens Petersen - 1.5.0.1-1 +- update to 1.5.0.1 + * Sun Feb 17 2019 Jens Petersen - 1.4.5-3 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 587e848..262660b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.4.5.tar.gz) = 5ba3152996d64bf4a41e3c791e8a657b8a9353ddde7ebdee5e2c60a4a4498cba9e0105ecb98107769a68cdc55109bd6087acdf124577c5b3dab2d3e24c0f40c9 +SHA512 (haddock-library-1.5.0.1.tar.gz) = 832f21280ab2dce56c668dcf087c884bc450455d8198fb75ee856c19ce1b547f4a2c1403f4f20e044382f140fed848ae7657da9d05a0ab0f0752433b20397559 From a37dbd357bffd909ee6be7d307e4ad9b962e5209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:31:41 +0000 Subject: [PATCH 21/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 60ddb72..33ec52a 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -105,6 +105,9 @@ files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 1.5.0.1-1 - update to 1.5.0.1 From 8f6264aeb099c4c436e2b64b658b6a8cdd6f1d83 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:23:34 +0000 Subject: [PATCH 22/38] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-haddock-library.spec | 48 ++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 33ec52a..f2d6a51 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haddock-library @@ -22,6 +22,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # 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 BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel @@ -50,11 +56,8 @@ itself, see the ‘haddock’ package. %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} @@ -63,6 +66,25 @@ 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 + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -85,14 +107,6 @@ files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -104,6 +118,16 @@ files. %doc CHANGES.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 - 1.5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9b99f2388caa1aeac5402baf70020c286898efb7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:50:05 +0000 Subject: [PATCH 23/38] update to 1.7.0 --- .gitignore | 1 + ghc-haddock-library.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1d8bd9e..98093aa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /haddock-library-1.4.3.tar.gz /haddock-library-1.4.5.tar.gz /haddock-library-1.5.0.1.tar.gz +/haddock-library-1.7.0.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index f2d6a51..c8b0a4b 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -10,8 +10,8 @@ %global without_haddock 1 Name: ghc-%{pkg_name} -Version: 1.5.0.1 -Release: 2%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -29,14 +29,15 @@ BuildRequires: ghc-doc BuildRequires: ghc-prof %endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hspec-devel @@ -49,8 +50,8 @@ BuildRequires: ghc-tree-diff-devel Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it without pulling in the GHC dependency. Please note that the API is likely to change so specify upper -bounds in your project if you can't release often. For interacting with Haddock -itself, see the ‘haddock’ package. +bounds in your project. For interacting with Haddock itself, see the [haddock +package](https://hackage.haskell.org/package/haddock). %package devel @@ -110,7 +111,6 @@ This package provides the Haskell %{pkg_name} profiling library. %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE -%license vendor/attoparsec-0.13.1.0/LICENSE # End cabal-rpm files @@ -129,6 +129,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 1.7.0-1 +- update to 1.7.0 + * Thu Jul 25 2019 Fedora Release Engineering - 1.5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 262660b..e5000e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.5.0.1.tar.gz) = 832f21280ab2dce56c668dcf087c884bc450455d8198fb75ee856c19ce1b547f4a2c1403f4f20e044382f140fed848ae7657da9d05a0ab0f0752433b20397559 +SHA512 (haddock-library-1.7.0.tar.gz) = ae4a3e2e02a866399623349c69b19738b371c574a72b2616f74c9b8fa2acdc04dfb20b7ef6cdd32709b474c0c99d27a49a810b7c58f68d8eb6bea7244323c30c From 39183068cb522e98a95c85de10c8ca183b7df2c0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:29:31 +0800 Subject: [PATCH 24/38] BR prof for lib and static for executable --- ghc-haddock-library.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index c8b0a4b..e7f40d2 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haddock-library @@ -22,18 +22,13 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # 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 -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-parsec-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-transformers-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-transformers-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel @@ -57,6 +52,7 @@ package](https://hackage.haskell.org/package/haddock). %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 9ed690448c236a7e02b4ed201245e13b45fcb024 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:47:18 +0000 Subject: [PATCH 25/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index e7f40d2..e0c8a18 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -125,6 +125,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 1.7.0-1 - update to 1.7.0 From 3daa47cd64bdeed7f0c170880c88925bd3a7dd41 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:50:19 +0800 Subject: [PATCH 26/38] refresh to cabal-rpm-2.0.2 --- ghc-haddock-library.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index e0c8a18..28306b1 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name haddock-library @@ -6,9 +6,6 @@ %bcond_with tests -# haddock breaks with internal libraries -%global without_haddock 1 - Name: ghc-%{pkg_name} Version: 1.7.0 Release: 2%{?dist} @@ -33,11 +30,7 @@ BuildRequires: ghc-transformers-prof BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel BuildRequires: ghc-hspec-devel -BuildRequires: ghc-optparse-applicative-devel -BuildRequires: ghc-tree-diff-devel %endif # End cabal-rpm deps @@ -66,6 +59,7 @@ 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. @@ -76,6 +70,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. @@ -104,6 +99,16 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test +%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 @@ -116,6 +121,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From a4a14c430b8b90085cf6d369e51416e3bc67f3c7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:26:37 +0800 Subject: [PATCH 27/38] refresh to cabal-rpm-2.0.5 --- ghc-haddock-library.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 28306b1..fef7297 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name haddock-library %global pkgver %{pkg_name}-%{version} From c5c321c9a6f3140f0f542f05346d2699e3066645 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 02:06:42 +0800 Subject: [PATCH 28/38] update to 1.8.0 --- .gitignore | 1 + ghc-haddock-library.spec | 28 ++++----- haddock-library-1.8.0.cabal | 116 ++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 haddock-library-1.8.0.cabal diff --git a/.gitignore b/.gitignore index 98093aa..6eda9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /haddock-library-1.4.5.tar.gz /haddock-library-1.5.0.1.tar.gz /haddock-library-1.7.0.tar.gz +/haddock-library-1.8.0.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index fef7297..e9d906a 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -4,17 +4,16 @@ %global pkg_name haddock-library %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} -Version: 1.7.0 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -26,20 +25,14 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-hspec-devel -%endif # End cabal-rpm deps %description Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it without pulling in the GHC -dependency. Please note that the API is likely to change so specify upper -bounds in your project. For interacting with Haddock itself, see the [haddock -package](https://hackage.haskell.org/package/haddock). +dependency. Please note that the API is likely to change so be sure to specify +upper bounds in your projects. For interacting with Haddock itself, see the +[haddock package](https://hackage.haskell.org/package/haddock). %package devel @@ -80,6 +73,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -92,13 +86,10 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGES.md # End cabal-rpm install -%check -%cabal_test - - %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -131,6 +122,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jun 07 2020 Jens Petersen - 1.8.0-1 +- update to 1.8.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/haddock-library-1.8.0.cabal b/haddock-library-1.8.0.cabal new file mode 100644 index 0000000..033bbc0 --- /dev/null +++ b/haddock-library-1.8.0.cabal @@ -0,0 +1,116 @@ +cabal-version: 2.2 +name: haddock-library +version: 1.8.0 +x-revision: 1 +synopsis: Library exposing some functionality of Haddock. + +description: Haddock is a documentation-generation tool for Haskell + libraries. These modules expose some + functionality of it without pulling in the GHC + dependency. Please note that the API is likely + to change so be sure to specify upper bounds in + your projects. For interacting with Haddock + itself, see the [haddock package](https://hackage.haskell.org/package/haddock). + +license: BSD-2-Clause +license-files: LICENSE +maintainer: Alec Theriault , Alex Biehl , Simon Hengel , Mateusz Kowalczyk +homepage: http://www.haskell.org/haddock/ +bug-reports: https://github.com/haskell/haddock/issues +category: Documentation +extra-source-files: + CHANGES.md + fixtures/examples/*.input + fixtures/examples/*.parsed + +common lib-defaults + default-language: Haskell2010 + + build-depends: + , base >= 4.7 && < 4.14 + , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.0 + , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 + , transformers ^>= 0.3.0.0 || ^>= 0.4.1.0 || ^>= 0.5.0.0 + , text ^>= 1.2.3.0 + , parsec ^>= 3.1.13.0 + + ghc-options: -funbox-strict-fields -Wall -fwarn-tabs + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances + +library + import: lib-defaults + + hs-source-dirs: src + + exposed-modules: + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Types + + other-modules: + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Identifier + +test-suite spec + import: lib-defaults + type: exitcode-stdio-1.0 + main-is: Spec.hs + hs-source-dirs: + test + src + + cpp-options: + -DTEST + + other-modules: + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.UtilSpec + Documentation.Haddock.ParserSpec + Documentation.Haddock.Types + Documentation.Haddock.Parser.Identifier + + build-depends: + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , QuickCheck ^>= 2.11 || ^>= 2.13.2 + , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 + + -- NB: build-depends & build-tool-depends have independent + -- install-plans, so it's best to limit to a single major + -- version of `hspec` & `hspec-discover` to ensure + -- intercompatibility + build-depends: + , hspec >= 2.4.4 && < 2.8 + + build-tool-depends: + , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 + +test-suite fixtures + type: exitcode-stdio-1.0 + default-language: Haskell2010 + main-is: Fixtures.hs + ghc-options: -Wall + hs-source-dirs: fixtures + build-depends: + -- intra-package dependency + , haddock-library + -- constraints inherited via lib:haddock-library component + , base + + -- extra dependencies + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , directory ^>= 1.3.0.2 + , filepath ^>= 1.4.1.2 + , optparse-applicative ^>= 0.15 + , tree-diff ^>= 0.1 + +source-repository head + type: git + subdir: haddock-library + location: https://github.com/haskell/haddock.git diff --git a/sources b/sources index e5000e5..c4fcd45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.7.0.tar.gz) = ae4a3e2e02a866399623349c69b19738b371c574a72b2616f74c9b8fa2acdc04dfb20b7ef6cdd32709b474c0c99d27a49a810b7c58f68d8eb6bea7244323c30c +SHA512 (haddock-library-1.8.0.tar.gz) = f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b From 917f5b76555c65fe11c65309fb8c3a5072b0d754 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:55:14 +0800 Subject: [PATCH 29/38] refresh to cabal-rpm-2.0.6 --- ghc-haddock-library.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index e9d906a..3375eb2 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,9 +1,11 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name haddock-library %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: tree-diff + Name: ghc-%{pkg_name} Version: 1.8.0 Release: 1%{?dist} @@ -74,6 +76,7 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} cp -bp %{SOURCE1} %{pkg_name}.cabal +chmod a-x CHANGES.md # End cabal-rpm setup @@ -86,20 +89,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x CHANGES.md # 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 6eee43316fe9551efca8005b781a3ba51011a26d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:11:48 +0000 Subject: [PATCH 30/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 3375eb2..9b6b71c 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -114,6 +114,9 @@ chmod a-x CHANGES.md %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Jens Petersen - 1.8.0-1 - update to 1.8.0 From acb0e03b9373aa00435fed304b276e227bd3a2f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:15:27 +0000 Subject: [PATCH 31/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 9b6b71c..93d6f79 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -114,6 +114,9 @@ chmod a-x CHANGES.md %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 173b247ba0baf7745d15bf4fd798ea253b008ec6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:43:47 +0000 Subject: [PATCH 32/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 93d6f79..df15018 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -114,6 +114,9 @@ chmod a-x CHANGES.md %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 63b650c50412909407ae33731de0daa972e59d56 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Jan 2021 20:32:26 +0800 Subject: [PATCH 33/38] update to 1.9.0 --- .gitignore | 1 + ghc-haddock-library.spec | 9 +-- haddock-library-1.8.0.cabal | 116 ------------------------------------ sources | 2 +- 4 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 haddock-library-1.8.0.cabal diff --git a/.gitignore b/.gitignore index 6eda9fd..eeb1233 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /haddock-library-1.5.0.1.tar.gz /haddock-library-1.7.0.tar.gz /haddock-library-1.8.0.tar.gz +/haddock-library-1.9.0.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index df15018..7d15ca3 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -7,15 +7,14 @@ # testsuite missing deps: tree-diff Name: ghc-%{pkg_name} -Version: 1.8.0 -Release: 4%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: Library exposing some functionality of Haddock License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -75,7 +74,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal chmod a-x CHANGES.md # End cabal-rpm setup @@ -114,6 +112,9 @@ chmod a-x CHANGES.md %changelog +* Fri Aug 6 2021 Jens Petersen - 1.9.0-1 +- update to 1.9.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/haddock-library-1.8.0.cabal b/haddock-library-1.8.0.cabal deleted file mode 100644 index 033bbc0..0000000 --- a/haddock-library-1.8.0.cabal +++ /dev/null @@ -1,116 +0,0 @@ -cabal-version: 2.2 -name: haddock-library -version: 1.8.0 -x-revision: 1 -synopsis: Library exposing some functionality of Haddock. - -description: Haddock is a documentation-generation tool for Haskell - libraries. These modules expose some - functionality of it without pulling in the GHC - dependency. Please note that the API is likely - to change so be sure to specify upper bounds in - your projects. For interacting with Haddock - itself, see the [haddock package](https://hackage.haskell.org/package/haddock). - -license: BSD-2-Clause -license-files: LICENSE -maintainer: Alec Theriault , Alex Biehl , Simon Hengel , Mateusz Kowalczyk -homepage: http://www.haskell.org/haddock/ -bug-reports: https://github.com/haskell/haddock/issues -category: Documentation -extra-source-files: - CHANGES.md - fixtures/examples/*.input - fixtures/examples/*.parsed - -common lib-defaults - default-language: Haskell2010 - - build-depends: - , base >= 4.7 && < 4.14 - , bytestring ^>= 0.9.2.1 || ^>= 0.10.0.0 - , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 - , transformers ^>= 0.3.0.0 || ^>= 0.4.1.0 || ^>= 0.5.0.0 - , text ^>= 1.2.3.0 - , parsec ^>= 3.1.13.0 - - ghc-options: -funbox-strict-fields -Wall -fwarn-tabs - if impl(ghc >= 8.0) - ghc-options: -Wcompat -Wnoncanonical-monad-instances - -library - import: lib-defaults - - hs-source-dirs: src - - exposed-modules: - Documentation.Haddock.Doc - Documentation.Haddock.Markup - Documentation.Haddock.Parser - Documentation.Haddock.Types - - other-modules: - Documentation.Haddock.Parser.Util - Documentation.Haddock.Parser.Monad - Documentation.Haddock.Parser.Identifier - -test-suite spec - import: lib-defaults - type: exitcode-stdio-1.0 - main-is: Spec.hs - hs-source-dirs: - test - src - - cpp-options: - -DTEST - - other-modules: - Documentation.Haddock.Doc - Documentation.Haddock.Markup - Documentation.Haddock.Parser - Documentation.Haddock.Parser.Monad - Documentation.Haddock.Parser.Util - Documentation.Haddock.Parser.UtilSpec - Documentation.Haddock.ParserSpec - Documentation.Haddock.Types - Documentation.Haddock.Parser.Identifier - - build-depends: - , base-compat ^>= 0.9.3 || ^>= 0.11.0 - , QuickCheck ^>= 2.11 || ^>= 2.13.2 - , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 - - -- NB: build-depends & build-tool-depends have independent - -- install-plans, so it's best to limit to a single major - -- version of `hspec` & `hspec-discover` to ensure - -- intercompatibility - build-depends: - , hspec >= 2.4.4 && < 2.8 - - build-tool-depends: - , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 - -test-suite fixtures - type: exitcode-stdio-1.0 - default-language: Haskell2010 - main-is: Fixtures.hs - ghc-options: -Wall - hs-source-dirs: fixtures - build-depends: - -- intra-package dependency - , haddock-library - -- constraints inherited via lib:haddock-library component - , base - - -- extra dependencies - , base-compat ^>= 0.9.3 || ^>= 0.11.0 - , directory ^>= 1.3.0.2 - , filepath ^>= 1.4.1.2 - , optparse-applicative ^>= 0.15 - , tree-diff ^>= 0.1 - -source-repository head - type: git - subdir: haddock-library - location: https://github.com/haskell/haddock.git diff --git a/sources b/sources index c4fcd45..be8c13d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.8.0.tar.gz) = f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b +SHA512 (haddock-library-1.9.0.tar.gz) = ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5 From 2527ec99669f67c3dd0211a1a3f9b89bbf2ee6ab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:11 +0800 Subject: [PATCH 34/38] refresh to cabal-rpm-2.0.9 --- ghc-haddock-library.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 7d15ca3..1ae9931 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name haddock-library @@ -54,6 +54,7 @@ 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. @@ -74,7 +75,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -chmod a-x CHANGES.md # End cabal-rpm setup From 703781948f8434238b6bacf68cee2a67db1da4da Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 11:20:32 +0800 Subject: [PATCH 35/38] update to 1.10.0 --- .gitignore | 1 + ghc-haddock-library.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eeb1233..18d7921 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /haddock-library-1.7.0.tar.gz /haddock-library-1.8.0.tar.gz /haddock-library-1.9.0.tar.gz +/haddock-library-1.10.0.tar.gz diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 1ae9931..e151b21 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -7,7 +7,7 @@ # testsuite missing deps: tree-diff Name: ghc-%{pkg_name} -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Summary: Library exposing some functionality of Haddock @@ -112,6 +112,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Aug 6 2021 Jens Petersen - 1.10.0-1 +- update to 1.10.0 + * Fri Aug 6 2021 Jens Petersen - 1.9.0-1 - update to 1.9.0 diff --git a/sources b/sources index be8c13d..2f0dc45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haddock-library-1.9.0.tar.gz) = ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5 +SHA512 (haddock-library-1.10.0.tar.gz) = dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1 From 8a16cdd2a0084f5ff226147ef84982cedcd2338c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:57:18 +0000 Subject: [PATCH 36/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-haddock-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index e151b21..932d6a5 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library exposing some functionality of Haddock License: BSD @@ -112,6 +112,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 6 2021 Jens Petersen - 1.10.0-1 - update to 1.10.0 From aa9897a2338f6a96e93ff32f5a38eb014763ca70 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 18 Jun 2022 00:21:41 +0800 Subject: [PATCH 37/38] revise .cabal --- ghc-haddock-library.spec | 3 + haddock-library-1.10.0.cabal | 127 +++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 haddock-library-1.10.0.cabal diff --git a/ghc-haddock-library.spec b/ghc-haddock-library.spec index 932d6a5..915c316 100644 --- a/ghc-haddock-library.spec +++ b/ghc-haddock-library.spec @@ -15,9 +15,11 @@ License: BSD 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof @@ -75,6 +77,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup diff --git a/haddock-library-1.10.0.cabal b/haddock-library-1.10.0.cabal new file mode 100644 index 0000000..3edc42d --- /dev/null +++ b/haddock-library-1.10.0.cabal @@ -0,0 +1,127 @@ +cabal-version: 2.2 +name: haddock-library +version: 1.10.0 +x-revision: 3 +synopsis: Library exposing some functionality of Haddock. + +description: Haddock is a documentation-generation tool for Haskell + libraries. These modules expose some + functionality of it without pulling in the GHC + dependency. Please note that the API is likely + to change so be sure to specify upper bounds in + your projects. For interacting with Haddock + itself, see the [haddock package](https://hackage.haskell.org/package/haddock). + +license: BSD-2-Clause +license-file: LICENSE +maintainer: Alec Theriault , Alex Biehl , Simon Hengel , Mateusz Kowalczyk +homepage: http://www.haskell.org/haddock/ +bug-reports: https://github.com/haskell/haddock/issues +category: Documentation +tested-with: GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.3 + , GHC == 8.10.1 + , GHC == 9.0.1 + +extra-source-files: + CHANGES.md + fixtures/examples/*.input + fixtures/examples/*.parsed + +common lib-defaults + default-language: Haskell2010 + + build-depends: + , base >= 4.5 && < 4.17 + , bytestring + , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 + , transformers + , text ^>= 1.2.3.0 || ^>= 2.0 + , parsec ^>= 3.1.13.0 + + ghc-options: -funbox-strict-fields -Wall + if impl(ghc >= 8.0) + ghc-options: -Wcompat -Wnoncanonical-monad-instances + +library + import: lib-defaults + + hs-source-dirs: src + + exposed-modules: + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Types + + other-modules: + CompatPrelude + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Identifier + +test-suite spec + import: lib-defaults + type: exitcode-stdio-1.0 + main-is: Spec.hs + hs-source-dirs: + test + src + + other-modules: + CompatPrelude + Documentation.Haddock.Doc + Documentation.Haddock.Markup + Documentation.Haddock.Parser + Documentation.Haddock.Parser.Monad + Documentation.Haddock.Parser.Util + Documentation.Haddock.Parser.UtilSpec + Documentation.Haddock.ParserSpec + Documentation.Haddock.Types + Documentation.Haddock.Parser.Identifier + + build-depends: + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , QuickCheck ^>= 2.11 || ^>= 2.13.2 || ^>= 2.14 + , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 + + -- NB: build-depends & build-tool-depends have independent + -- install-plans, so it's best to limit to a single major + -- version of `hspec` & `hspec-discover` to ensure + -- intercompatibility + build-depends: + , hspec >= 2.4.4 && < 2.8 + + build-tool-depends: + , hspec-discover:hspec-discover >= 2.4.4 && < 2.8 + +test-suite fixtures + type: exitcode-stdio-1.0 + default-language: Haskell2010 + main-is: Fixtures.hs + ghc-options: -Wall + hs-source-dirs: fixtures + build-depends: + -- intra-package dependency + , haddock-library + -- constraints inherited via lib:haddock-library component + , base + + -- extra dependencies + , base-compat ^>= 0.9.3 || ^>= 0.11.0 + , directory ^>= 1.3.0.2 + , filepath ^>= 1.4.1.2 + , optparse-applicative ^>= 0.15 + , tree-diff ^>= 0.1 + +source-repository head + type: git + subdir: haddock-library + location: https://github.com/haskell/haddock.git From 62583f7cb9e5dcec4954c205a037d9bc3dfe109e Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:40:18 +0300 Subject: [PATCH 38/38] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 2f0dc45..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (haddock-library-1.10.0.tar.gz) = dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1