From 7b2ec386267657e428f50e56572ae17475a47492 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 28 Aug 2017 12:17:59 +0000 Subject: [PATCH 01/30] 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..1ad5675 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-base-orphans + +The ghc-base-orphans package \ No newline at end of file From fef0924a38478ce5d9404fdbd81968554fd29d8d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 28 Aug 2017 19:51:59 -0400 Subject: [PATCH 02/30] Initial import (#1485493). --- .gitignore | 1 + README.md | 3 -- ghc-base-orphans.spec | 100 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-base-orphans.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bc02237 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/base-orphans-0.6.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 1ad5675..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-base-orphans - -The ghc-base-orphans package \ No newline at end of file diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec new file mode 100644 index 0000000..9d32910 --- /dev/null +++ b/ghc-base-orphans.spec @@ -0,0 +1,100 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name base-orphans +%global pkgver %{pkg_name}-%{version} + +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 0.6 +Release: 1.git.0.db5c088%{?dist} +Summary: Backwards-compatible orphan instances for base + +License: MIT +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-hspec-devel +%endif +# End cabal-rpm deps + +%description +'base-orphans' defines orphan instances that mimic instances available in later +versions of 'base' to a wider (older) range of compilers. +'base-orphans' does not export anything except the orphan instances themselves +and complements ''. +See the README for what instances are covered: +. See also the + section. + + +%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} + + +%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 CHANGES.markdown README.markdown + + +%changelog +* Sat Aug 26 2017 Elliott Sales de Andrade 0.6-1 +- Update to latest version. +- Update to latest spec template. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.5.4-4 +- Re-add dist tag to release numbers. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.5.4-3 +- Bump for Fedora 26. + +* Mon Jul 17 2017 Elliott Sales de Andrade +- Bump release for Fedora 26. + +* Fri Dec 16 2016 Elliott Sales de Andrade - 0.5.4-2 +- Update release to be newer than previous builds + +* Fri Dec 16 2016 Fedora Haskell SIG - 0.5.4-1 +- spec file generated by cabal-rpm-0.10.0 diff --git a/sources b/sources new file mode 100644 index 0000000..9ab75f0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (base-orphans-0.6.tar.gz) = 925c1fa075413654c20c32bbe15e613a79aa3dcf6aeec9402c828c050c55bf9078d8acef522c82b792a9792ccb1bfb4d56dce4ffe03d5047c83a05ef123fa402 From 57b6aab95817111e03e5763048ef235afc3155c5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 28 Aug 2017 19:52:14 -0400 Subject: [PATCH 03/30] Fix release number. --- ghc-base-orphans.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 9d32910..222a3ce 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6 -Release: 1.git.0.db5c088%{?dist} +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT From 0f85b03da9eecfafb5648cd2cb9924961cdd52e7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:37 +0100 Subject: [PATCH 04/30] refresh to cabal-rpm-0.12.1 --- ghc-base-orphans.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 222a3ce..ff57f97 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name base-orphans @@ -38,9 +38,12 @@ covered> section. %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 @@ -63,6 +66,12 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From a66443bfc2e03b2e644d3c7849309de05034d026 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:19:12 +0100 Subject: [PATCH 05/30] bump release --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index ff57f97..01b5a13 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -89,6 +89,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 26 2018 Jens Petersen - 0.6-2 +- rebuild + * Sat Aug 26 2017 Elliott Sales de Andrade 0.6-1 - Update to latest version. - Update to latest spec template. From bd94cdfe80e15536ddb7fa8fbf757135d1fd9c18 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:01:59 +0900 Subject: [PATCH 06/30] drop ldconfig scriptlets --- ghc-base-orphans.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 01b5a13..2e11620 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -66,12 +66,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 5390225c028bff297f5d463716325287fe31d6b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:20:02 +0000 Subject: [PATCH 07/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 2e11620..2848587 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.6-2 - rebuild From 729ee62d862c3b00a536b890bb0d3e950b64c3ea Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 9 Jul 2018 01:00:36 -0400 Subject: [PATCH 08/30] update to 0.7 --- .gitignore | 1 + ghc-base-orphans.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc02237..bc74699 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /base-orphans-0.6.tar.gz +/base-orphans-0.7.tar.gz diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 2848587..ed12e90 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6 -Release: 3%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 09 2018 Elliott Sales de Andrade - 0.7-1 +- update to 0.7 + * Wed Feb 07 2018 Fedora Release Engineering - 0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 9ab75f0..bde3be2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-orphans-0.6.tar.gz) = 925c1fa075413654c20c32bbe15e613a79aa3dcf6aeec9402c828c050c55bf9078d8acef522c82b792a9792ccb1bfb4d56dce4ffe03d5047c83a05ef123fa402 +SHA512 (base-orphans-0.7.tar.gz) = 0fe0ba79ac42127bf606765ab1d1eba4f1a858113f824e1b9ed0900a08a0552f1afc45a8d7fbbcb343717a1ca7477a1737ced5950535000267ceb48029679d9f From 63b2408eb096d941f6b2370a948bdc7ec1bed90e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:34:18 +0000 Subject: [PATCH 09/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index ed12e90..1ad0274 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Elliott Sales de Andrade - 0.7-1 - update to 0.7 From 61b58d9b3b3e227a07d0b891d3a422a9d08d5f25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:11:51 +0000 Subject: [PATCH 10/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 1ad0274..a002b91 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5c61ccd01e0184e5af773b3d91320cb862648b5b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:35 +0800 Subject: [PATCH 11/30] refresh to cabal-rpm-0.13 --- ghc-base-orphans.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index a002b91..f9773ba 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name base-orphans @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT 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: %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel @@ -51,15 +53,21 @@ This package provides the Haskell %{pkg_name} library development 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 @@ -75,7 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -83,6 +93,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.7-4 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 61ba1ba5ea0d05526120861c114e9a80daff8da3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:08:00 +0000 Subject: [PATCH 12/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index f9773ba..8348e11 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -93,6 +93,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.7-4 - refresh to cabal-rpm-0.13 From 75d927025447e2b083508b210901160315f0f511 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:39 +0000 Subject: [PATCH 13/30] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-base-orphans.spec | 48 ++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 8348e11..7da90bd 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.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 base-orphans @@ -19,6 +19,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 %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -40,11 +46,8 @@ covered> section. %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} @@ -52,6 +55,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 + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -74,14 +96,6 @@ This package provides the Haskell %{pkg_name} library development files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -92,6 +106,16 @@ This package provides the Haskell %{pkg_name} library development files. %doc CHANGES.markdown README.markdown +%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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From dc31540e6fa8c5a59bb599287357b4207d52f880 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:14:23 +0000 Subject: [PATCH 14/30] update to 0.8.1 --- .gitignore | 1 + ghc-base-orphans.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc74699..ad502a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /base-orphans-0.6.tar.gz /base-orphans-0.7.tar.gz +/base-orphans-0.8.1.tar.gz diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 7da90bd..80d94b5 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7 -Release: 5%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 0.8.1-1 +- update to 0.8.1 + * Thu Jul 25 2019 Fedora Release Engineering - 0.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index bde3be2..eb5143f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-orphans-0.7.tar.gz) = 0fe0ba79ac42127bf606765ab1d1eba4f1a858113f824e1b9ed0900a08a0552f1afc45a8d7fbbcb343717a1ca7477a1737ced5950535000267ceb48029679d9f +SHA512 (base-orphans-0.8.1.tar.gz) = e58fcb9f71c5922664d21a38889f2246284ffbbdffd5137d74354ff51737edee9cb4af80f643b2527fa730bdc34bd9f2ff560611b22516943b28416227b12f1b From 0ff992e15e52a653376f05c1d961cd72fcb300c6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:36 +0800 Subject: [PATCH 15/30] BR prof for lib and static for executable --- ghc-base-orphans.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 80d94b5..bd0e992 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.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 base-orphans @@ -19,13 +19,8 @@ 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-base-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel @@ -46,6 +41,7 @@ covered> section. %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 19ec11f7daee0718853c02f3846b80f5eee30c07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:18:02 +0000 Subject: [PATCH 16/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index bd0e992..a2299d6 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 0.8.1-1 - update to 0.8.1 From 0354c79ca85cbf5ed8f9a3cb3f965e2e459f49a3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 11:54:01 +0800 Subject: [PATCH 17/30] refresh to cabal-rpm-2.0.2 --- ghc-base-orphans.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index a2299d6..867f8cf 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.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 base-orphans @@ -54,6 +54,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. @@ -64,6 +65,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. @@ -92,6 +94,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 @@ -104,6 +116,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From acbb2a06ebb45e4b9e6ff49b5c7ae2d4d39da3ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 9 Feb 2020 21:55:21 +0800 Subject: [PATCH 18/30] update to 0.8.2 --- .gitignore | 1 + ghc-base-orphans.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ad502a6..e9b3817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /base-orphans-0.6.tar.gz /base-orphans-0.7.tar.gz /base-orphans-0.8.1.tar.gz +/base-orphans-0.8.2.tar.gz diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 867f8cf..d28118d 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -4,11 +4,11 @@ %global pkg_name base-orphans %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -126,6 +126,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Feb 09 2020 Jens Petersen - 0.8.2-1 +- update to 0.8.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index eb5143f..eb4edf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-orphans-0.8.1.tar.gz) = e58fcb9f71c5922664d21a38889f2246284ffbbdffd5137d74354ff51737edee9cb4af80f643b2527fa730bdc34bd9f2ff560611b22516943b28416227b12f1b +SHA512 (base-orphans-0.8.2.tar.gz) = f438d3434fa2f276af3bd23288e4cab2af94dfbb392b0a7eec747af3fed3856cdac2ce5f9476962cbf5ddbb2e48577469155101e84f7603534fc4d097da882e9 From c9e36d5e3cf591c35f4d70d889b3a767131e42eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:17 +0800 Subject: [PATCH 19/30] refresh to cabal-rpm-2.0.5 --- ghc-base-orphans.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index d28118d..a58880b 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.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 base-orphans %global pkgver %{pkg_name}-%{version} @@ -87,6 +87,7 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGES.markdown README.markdown # End cabal-rpm install From fb5567ed5b5c3bdb639d872b2259fe18803dfa80 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:55 +0800 Subject: [PATCH 20/30] refresh to cabal-rpm-2.0.6 --- ghc-base-orphans.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index a58880b..af6b816 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -1,4 +1,4 @@ -# 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 base-orphans @@ -24,6 +24,7 @@ BuildRequires: ghc-base-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-discover-devel %endif # End cabal-rpm deps @@ -75,6 +76,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +chmod a-x CHANGES.markdown README.markdown # End cabal-rpm setup @@ -87,7 +89,6 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x CHANGES.markdown README.markdown # End cabal-rpm install @@ -95,16 +96,6 @@ chmod a-x CHANGES.markdown README.markdown %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 From 3b981a9fa14a9b0338c7dca917a56bb7f8b8c15c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jul 2020 00:09:37 +0800 Subject: [PATCH 21/30] disable tests to avoid circular dep with hspec --- ghc-base-orphans.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index af6b816..7f54dac 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -4,7 +4,9 @@ %global pkg_name base-orphans %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# disabled to avoid circular dependency with hspec: +# hspec -> hspec-core -> tf-random -> primitive(tests) -> base-orphans(tests) -> hspec +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.8.2 From 7bbe296e18069191afb48dc8120cab7707532dcd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 17:52:56 +0800 Subject: [PATCH 22/30] bump release --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 7f54dac..66dd520 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -120,6 +120,9 @@ chmod a-x CHANGES.markdown README.markdown %changelog +* Fri Jul 17 2020 Jens Petersen - 0.8.2-2 +- refresh to cabal-rpm-2.0.6 + * Sun Feb 09 2020 Jens Petersen - 0.8.2-1 - update to 0.8.2 From eaefbb06b0dcae1a63c0763c9d722823f4da9f97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:48:56 +0000 Subject: [PATCH 23/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 66dd520..6289c35 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -120,6 +120,9 @@ chmod a-x CHANGES.markdown README.markdown %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.8.2-2 - refresh to cabal-rpm-2.0.6 From 345ec56c86f137ddb81a0528d79fc75a7ddceac2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:53:17 +0000 Subject: [PATCH 24/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 6289c35..53f7515 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -120,6 +120,9 @@ chmod a-x CHANGES.markdown README.markdown %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0151d3f01d5d574b16c6e300ff1ca91ab06e8181 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:20:04 +0000 Subject: [PATCH 25/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 53f7515..59175a0 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -120,6 +120,9 @@ chmod a-x CHANGES.markdown README.markdown %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4d7962cc54c7e7b21335f45b1e2fefd0faa9bca4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 09:24:26 +0800 Subject: [PATCH 26/30] update to 0.8.4 --- .gitignore | 1 + ghc-base-orphans.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e9b3817..a44afa4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /base-orphans-0.7.tar.gz /base-orphans-0.8.1.tar.gz /base-orphans-0.8.2.tar.gz +/base-orphans-0.8.4.tar.gz diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 59175a0..320036c 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -9,8 +9,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.8.4 +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -32,15 +32,11 @@ BuildRequires: ghc-hspec-discover-devel %description 'base-orphans' defines orphan instances that mimic instances available in later -versions of 'base' to a wider (older) range of compilers. -'base-orphans' does not export anything except the orphan instances themselves -and complements ''. -See the README for what instances are covered: -. See also the - section. +See the README for what instances are covered: + %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} @@ -120,6 +116,9 @@ chmod a-x CHANGES.markdown README.markdown %changelog +* Thu Aug 5 2021 Jens Petersen - 0.8.4-1 +- update to 0.8.4 + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index eb4edf1..d2ed194 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-orphans-0.8.2.tar.gz) = f438d3434fa2f276af3bd23288e4cab2af94dfbb392b0a7eec747af3fed3856cdac2ce5f9476962cbf5ddbb2e48577469155101e84f7603534fc4d097da882e9 +SHA512 (base-orphans-0.8.4.tar.gz) = ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6 From cb228457ec75b10069fc583215ab0649003dc016 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 27/30] refresh to cabal-rpm-2.0.9 --- ghc-base-orphans.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index 320036c..a55dfd9 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.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 base-orphans @@ -54,6 +54,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. @@ -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.markdown README.markdown # End cabal-rpm setup @@ -91,7 +91,9 @@ chmod a-x CHANGES.markdown README.markdown %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 57d87d8e6892b4150cab2e39bc57d466bce9fed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:32:30 +0000 Subject: [PATCH 28/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-base-orphans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index a55dfd9..f4dc831 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.8.4-1 - update to 0.8.4 From 9dcbc1f3e552b50273af6aa11c8238cdbc19d8ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 10:43:58 +0800 Subject: [PATCH 29/30] update to 0.8.6 --- .gitignore | 1 + ghc-base-orphans.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a44afa4..fe8a0f4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /base-orphans-0.8.1.tar.gz /base-orphans-0.8.2.tar.gz /base-orphans-0.8.4.tar.gz +/base-orphans-0.8.6.tar.gz diff --git a/ghc-base-orphans.spec b/ghc-base-orphans.spec index f4dc831..e810227 100644 --- a/ghc-base-orphans.spec +++ b/ghc-base-orphans.spec @@ -9,8 +9,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.4 -Release: 2%{?dist} +Version: 0.8.6 +Release: 1%{?dist} Summary: Backwards-compatible orphan instances for base License: MIT @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 0.8.6-1 +- https://hackage.haskell.org/package/base-orphans-0.8.6/changelog + * Thu Jan 20 2022 Fedora Release Engineering - 0.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d2ed194..dc62bed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (base-orphans-0.8.4.tar.gz) = ce59bd56c5acc38f3c5c55d619b27684a8cc35c0b14c2dac6a4cfa56d503e25c7a764210a7cb9cef93b0acc02371af0e40d8024b7a48e88a8ebdf406fed206a6 +SHA512 (base-orphans-0.8.6.tar.gz) = 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff From 2a71862565df002fa4ac9b415a2ed20595b5b980 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:23:10 +0300 Subject: [PATCH 30/30] 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 dc62bed..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (base-orphans-0.8.6.tar.gz) = 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff