From 736446361c731db145a2f4a77cba66c1d91cb749 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 15 Mar 2012 12:39:22 +0000 Subject: [PATCH 01/62] 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 4ef82634db9b8b59e9ff26e93087f510de608110 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 Mar 2012 17:16:51 +0900 Subject: [PATCH 02/62] import (#797706) --- .gitignore | 1 + ghc-aeson.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 73 insertions(+) create mode 100644 ghc-aeson.spec diff --git a/.gitignore b/.gitignore index e69de29..92103a8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/aeson-0.6.0.0.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec new file mode 100644 index 0000000..825a42b --- /dev/null +++ b/ghc-aeson.spec @@ -0,0 +1,71 @@ +# cabal2spec-0.25 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + +%global pkg_name aeson + +%global common_summary Fast JSON parsing and encoding + +%global common_description A JSON parsing and encoding library optimized for ease of use and\ +high performance. Aeson was the father of Jason in Greek mythology. + +Name: ghc-%{pkg_name} +Version: 0.6.0.0 +Release: 1%{?dist} +Summary: %{common_summary} + +Group: System Environment/Libraries +License: BSD +# BEGIN cabal2spec +URL: http://hackage.haskell.org/package/%{pkg_name} +Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-blaze-builder-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-syb-devel +BuildRequires: ghc-template-haskell-devel +BuildRequires: ghc-text-devel >= 0.11.1.0 +BuildRequires: ghc-time-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel + +%description +%{common_description} + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +# devel subpackage +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files LICENSE +%doc README.markdown release-notes.markdown examples + + +%changelog +* Mon Feb 27 2012 Jens Petersen - 0.6.0.0-1 +- BSD license +- doc files + +* Mon Feb 27 2012 Fedora Haskell SIG +- spec file template generated by cabal2spec-0.25.4 diff --git a/sources b/sources index e69de29..3fbad16 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +8e1030ad37a7537ec438a30b15da90e1 aeson-0.6.0.0.tar.gz From f3feb1adbbd4d383fb62cfdc8e275209a00e4607 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 24 Mar 2012 16:40:39 +0900 Subject: [PATCH 03/62] rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 825a42b..0d1a471 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -63,6 +63,9 @@ BuildRequires: ghc-vector-devel %changelog +* Sat Mar 24 2012 Jens Petersen - 0.6.0.0-2 +- rebuild + * Mon Feb 27 2012 Jens Petersen - 0.6.0.0-1 - BSD license - doc files From e695cfe92e025989769bfa1033b04e0ba1c52346 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 24 Mar 2012 17:07:14 +0900 Subject: [PATCH 04/62] depends on dlist for ghc > 7.2 --- ghc-aeson.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 0d1a471..36cbc59 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -32,6 +32,8 @@ BuildRequires: ghc-text-devel >= 0.11.1.0 BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +# for ghc > 7.2 +BuildRequires: ghc-dlist-devel %description %{common_description} @@ -64,7 +66,7 @@ BuildRequires: ghc-vector-devel %changelog * Sat Mar 24 2012 Jens Petersen - 0.6.0.0-2 -- rebuild +- depends on dlist for ghc > 7.2 * Mon Feb 27 2012 Jens Petersen - 0.6.0.0-1 - BSD license From d0b17ea4c29d4148f49ca7eede2ece3289f02c3f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 6 May 2012 10:19:09 +0900 Subject: [PATCH 05/62] update to 0.6.0.2 ; build needs ghci --- .gitignore | 1 + ghc-aeson.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 92103a8..23981f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aeson-0.6.0.0.tar.gz +/aeson-0.6.0.2.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 36cbc59..47c0049 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -10,8 +10,8 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} -Version: 0.6.0.0 -Release: 2%{?dist} +Version: 0.6.0.2 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -19,7 +19,7 @@ License: BSD # BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} +ExclusiveArch: %{ghc_arches_with_ghci} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec @@ -65,6 +65,10 @@ BuildRequires: ghc-dlist-devel %changelog +* Sun May 6 2012 Jens Petersen - 0.6.0.2-1 +- update to 0.6.0.2 +- build needs ghci + * Sat Mar 24 2012 Jens Petersen - 0.6.0.0-2 - depends on dlist for ghc > 7.2 diff --git a/sources b/sources index 3fbad16..99b9bcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e1030ad37a7537ec438a30b15da90e1 aeson-0.6.0.0.tar.gz +e69ee831158b481e778dd60b540a4a79 aeson-0.6.0.2.tar.gz From 41cab0d5db1ce9e3889b3928fead062010a8550b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jun 2012 14:25:36 +0900 Subject: [PATCH 06/62] rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 47c0049..97647d4 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -65,6 +65,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Fri Jun 15 2012 Jens Petersen - 0.6.0.2-2 +- rebuild + * Sun May 6 2012 Jens Petersen - 0.6.0.2-1 - update to 0.6.0.2 - build needs ghci From cc8e808198552a6284d211472aa4f2213b85d0a4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Jun 2012 16:58:59 +0900 Subject: [PATCH 07/62] rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 97647d4..2395ee3 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -65,6 +65,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Thu Jun 21 2012 Jens Petersen - 0.6.0.2-3 +- rebuild + * Fri Jun 15 2012 Jens Petersen - 0.6.0.2-2 - rebuild From 54924d434734290a608c4e6d9083f9e40f423ef1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 00:18:50 -0500 Subject: [PATCH 08/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 2395ee3..f36db72 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -65,6 +65,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.6.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jun 21 2012 Jens Petersen - 0.6.0.2-3 - rebuild From d987c2c73dc18d5b4e115a56183858c77621f69b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 17 Nov 2012 20:52:35 +0900 Subject: [PATCH 09/62] update with cabal-rpm --- ghc-aeson.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index f36db72..ccd7915 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,4 +1,3 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell @@ -11,27 +10,32 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches_with_ghci} + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-blaze-builder-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel +BuildRequires: ghc-old-locale-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-text-devel >= 0.11.1.0 +BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +ExclusiveArch: %{ghc_arches_with_ghci} +# End cabal-rpm deps # for ghc > 7.2 BuildRequires: ghc-dlist-devel @@ -51,7 +55,6 @@ BuildRequires: ghc-dlist-devel %ghc_lib_install -# devel subpackage %ghc_devel_package %ghc_devel_description @@ -65,6 +68,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Sat Nov 17 2012 Jens Petersen - 0.6.0.2-5 +- update with cabal-rpm + * Thu Jul 19 2012 Fedora Release Engineering - 0.6.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 1776f2d865922abf9862df5a5416d4824a74a2e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 16:55:10 -0600 Subject: [PATCH 10/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index ccd7915..a5c1e81 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -10,7 +10,7 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} Version: 0.6.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} License: BSD @@ -68,6 +68,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.6.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Nov 17 2012 Jens Petersen - 0.6.0.2-5 - update with cabal-rpm From e33114034fdde69d7588d8b5d44ad48176524ec7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Mar 2013 22:44:46 +0900 Subject: [PATCH 11/62] update to 0.6.1.0 --- .gitignore | 1 + ghc-aeson.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 23981f0..24a5187 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /aeson-0.6.0.0.tar.gz /aeson-0.6.0.2.tar.gz +/aeson-0.6.1.0.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a5c1e81..ef2f052 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -9,8 +9,8 @@ high performance. Aeson was the father of Jason in Greek mythology. Name: ghc-%{pkg_name} -Version: 0.6.0.2 -Release: 6%{?dist} +Version: 0.6.1.0 +Release: 1%{?dist} Summary: %{common_summary} License: BSD @@ -25,6 +25,7 @@ BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-locale-devel @@ -36,8 +37,6 @@ BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps -# for ghc > 7.2 -BuildRequires: ghc-dlist-devel %description %{common_description} @@ -68,6 +67,9 @@ BuildRequires: ghc-dlist-devel %changelog +* Mon Mar 11 2013 Jens Petersen - 0.6.1.0-1 +- update to 0.6.1.0 + * Wed Feb 13 2013 Fedora Release Engineering - 0.6.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 99b9bcb..3118687 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e69ee831158b481e778dd60b540a4a79 aeson-0.6.0.2.tar.gz +39dc2eb1eae08165795b6e3da2ca2ce9 aeson-0.6.1.0.tar.gz From e5311e7d0c97d8c0d8fad85831dab1b24d02f38b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Jun 2013 12:48:06 +0900 Subject: [PATCH 12/62] update to new simplified Haskell Packaging Guidelines --- ghc-aeson.spec | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index ef2f052..1fd584c 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,17 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name aeson -%global common_summary Fast JSON parsing and encoding - -%global common_description A JSON parsing and encoding library optimized for ease of use and\ -high performance. Aeson was the father of Jason in Greek mythology. - Name: ghc-%{pkg_name} Version: 0.6.1.0 -Release: 1%{?dist} -Summary: %{common_summary} +Release: 2%{?dist} +Summary: Fast JSON parsing and encoding License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} @@ -39,7 +33,19 @@ ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps %description -%{common_description} +A JSON parsing and encoding library optimized for ease of use and +high performance. Aeson was the father of Jason in Greek mythology. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. %prep @@ -54,19 +60,26 @@ ExclusiveArch: %{ghc_arches_with_ghci} %ghc_lib_install -%ghc_devel_package +%post devel +%ghc_pkg_recache -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc LICENSE -%ghc_files LICENSE + +%files devel -f %{name}-devel.files %doc README.markdown release-notes.markdown examples %changelog +* Fri Jun 07 2013 Jens Petersen - 0.6.1.0-2 +- update to new simplified Haskell Packaging Guidelines + * Mon Mar 11 2013 Jens Petersen - 0.6.1.0-1 - update to 0.6.1.0 From 6349d59fa15a88a8462479e94fa2ecd6a84b5b21 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 08:20:47 -0500 Subject: [PATCH 13/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 1fd584c..58601c8 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -77,6 +77,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.6.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jun 07 2013 Jens Petersen - 0.6.1.0-2 - update to new simplified Haskell Packaging Guidelines From 1d0c3f26af2d1ffe90389027d464225c520b333a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jan 2014 12:41:41 +0900 Subject: [PATCH 14/62] update to 0.6.2.1 --- .gitignore | 1 + ghc-aeson.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24a5187..ea16adb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /aeson-0.6.0.0.tar.gz /aeson-0.6.0.2.tar.gz /aeson-0.6.1.0.tar.gz +/aeson-0.6.2.1.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 58601c8..1da0029 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -3,8 +3,8 @@ %global pkg_name aeson Name: ghc-%{pkg_name} -Version: 0.6.1.0 -Release: 3%{?dist} +Version: 0.6.2.1 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -39,10 +39,11 @@ high performance. Aeson was the father of Jason in Greek mythology. %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} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. @@ -77,6 +78,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 22 2014 Jens Petersen - 0.6.2.1-1 +- update to 0.6.2.1 + * Sat Aug 03 2013 Fedora Release Engineering - 0.6.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 3118687..3430bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39dc2eb1eae08165795b6e3da2ca2ce9 aeson-0.6.1.0.tar.gz +3e06429d5e10812c9d8b8f184455e9a1 aeson-0.6.2.1.tar.gz From 9bb2841f4bc33c333fee40ba369fa7eb5a2a75f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 20 Apr 2014 15:08:33 +0900 Subject: [PATCH 15/62] disable TH module on arch's without ghci like debian --- aeson-disable-TH.patch | 10 ++++++++++ ghc-aeson.spec | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 aeson-disable-TH.patch diff --git a/aeson-disable-TH.patch b/aeson-disable-TH.patch new file mode 100644 index 0000000..d02bcac --- /dev/null +++ b/aeson-disable-TH.patch @@ -0,0 +1,10 @@ +--- aeson-0.6.2.1/aeson.cabal~ 2013-10-14 12:59:08.000000000 +0900 ++++ aeson-0.6.2.1/aeson.cabal 2014-04-20 15:03:05.037735911 +0900 +@@ -98,7 +98,6 @@ + Data.Aeson.Generic + Data.Aeson.Parser + Data.Aeson.Types +- Data.Aeson.TH + + other-modules: + Data.Aeson.Functions diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 1da0029..325d627 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -4,12 +4,14 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +# for archs without ghci +Patch1: aeson-disable-TH.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -29,7 +31,6 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -ExclusiveArch: %{ghc_arches_with_ghci} # End cabal-rpm deps %description @@ -51,6 +52,9 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +%ifnarch %{ghc_arches_with_ghci} +%patch1 -p1 -b .orig +%endif %build @@ -78,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Apr 20 2014 Jens Petersen - 0.6.2.1-2 +- disable TH module on arch's without ghci + * Wed Jan 22 2014 Jens Petersen - 0.6.2.1-1 - update to 0.6.2.1 From d49dc534523b8ec1fa8be52195cae2694d3c8cd7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:25:24 -0500 Subject: [PATCH 16/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 325d627..cd36dde 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Apr 20 2014 Jens Petersen - 0.6.2.1-2 - disable TH module on arch's without ghci From 36ccaee4e6aba74a0ac02c8803dc3dd175b225f4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 14:36:43 +0000 Subject: [PATCH 17/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index cd36dde..325a3d9 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.6.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.6.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.6.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 54a978db16f94742b07596c11db37ec8313ab42d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 14:37:05 +0900 Subject: [PATCH 18/62] update to 0.8.0.2 --- .gitignore | 1 + aeson-disable-TH.patch | 8 ++++---- ghc-aeson.spec | 29 +++++++++++++++++++++++------ sources | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ea16adb..98b47f1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aeson-0.6.0.2.tar.gz /aeson-0.6.1.0.tar.gz /aeson-0.6.2.1.tar.gz +/aeson-0.8.0.2.tar.gz diff --git a/aeson-disable-TH.patch b/aeson-disable-TH.patch index d02bcac..7257382 100644 --- a/aeson-disable-TH.patch +++ b/aeson-disable-TH.patch @@ -1,10 +1,10 @@ ---- aeson-0.6.2.1/aeson.cabal~ 2013-10-14 12:59:08.000000000 +0900 -+++ aeson-0.6.2.1/aeson.cabal 2014-04-20 15:03:05.037735911 +0900 -@@ -98,7 +98,6 @@ +--- aeson-0.8.0.2/aeson.cabal~ 2015-01-26 14:40:59.738569354 +0900 ++++ aeson-0.8.0.2/aeson.cabal 2015-01-26 14:44:24.394504016 +0900 +@@ -87,7 +87,6 @@ Data.Aeson.Generic Data.Aeson.Parser Data.Aeson.Types - Data.Aeson.TH other-modules: - Data.Aeson.Functions + Data.Aeson.Encode.ByteString diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 325a3d9..980cbb9 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -2,14 +2,16 @@ %global pkg_name aeson +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 0.6.2.1 -Release: 4%{?dist} +Version: 0.8.0.2 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz # for archs without ghci Patch1: aeson-disable-TH.patch @@ -17,20 +19,26 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -65,6 +73,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -82,6 +96,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jan 26 2015 Jens Petersen - 0.8.0.2-1 +- update to 0.8.0.2 + * Sat Aug 16 2014 Fedora Release Engineering - 0.6.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 3430bb8..4829922 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e06429d5e10812c9d8b8f184455e9a1 aeson-0.6.2.1.tar.gz +33f09a236e47dfa87f5fb292f48d189a aeson-0.8.0.2.tar.gz From 5caae1e879d1807f7827af2ac1b7a7e1df52aa8d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 15:23:32 +0900 Subject: [PATCH 19/62] release-notes.markdown gone --- ghc-aeson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 980cbb9..cd8cb68 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -92,7 +92,7 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files -%doc README.markdown release-notes.markdown examples +%doc README.markdown examples %changelog From cc9b54e880beda9efa969d1e40b834cf26123f3c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:30:28 +0000 Subject: [PATCH 20/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index cd8cb68..b4cf429 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -96,6 +96,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.8.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Jan 26 2015 Jens Petersen - 0.8.0.2-1 - update to 0.8.0.2 From 199e1459caf8ea6612da66799bc563f63ae056c4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 31 Aug 2015 20:28:11 +0100 Subject: [PATCH 21/62] Rebuild (aarch64 vector hashes) --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index b4cf429..b16f26d 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -96,6 +96,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Aug 31 2015 Peter Robinson 0.8.0.2-3 +- Rebuild (aarch64 vector hashes) + * Wed Jun 17 2015 Fedora Release Engineering - 0.8.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From ddb1fa7283287e00c812722a4d7379c708f09ad7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:24:30 +0000 Subject: [PATCH 22/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index b16f26d..cc26443 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -96,6 +96,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.8.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Peter Robinson 0.8.0.2-3 - Rebuild (aarch64 vector hashes) From 04b09e90f0f9b60272d8beba268d81ab336cfaf1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 7 Mar 2016 22:59:45 +0900 Subject: [PATCH 23/62] drop TH patch for not %ghc_arches_with_ghci --- aeson-disable-TH.patch | 10 ---------- ghc-aeson.spec | 5 ----- 2 files changed, 15 deletions(-) delete mode 100644 aeson-disable-TH.patch diff --git a/aeson-disable-TH.patch b/aeson-disable-TH.patch deleted file mode 100644 index 7257382..0000000 --- a/aeson-disable-TH.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- aeson-0.8.0.2/aeson.cabal~ 2015-01-26 14:40:59.738569354 +0900 -+++ aeson-0.8.0.2/aeson.cabal 2015-01-26 14:44:24.394504016 +0900 -@@ -87,7 +87,6 @@ - Data.Aeson.Generic - Data.Aeson.Parser - Data.Aeson.Types -- Data.Aeson.TH - - other-modules: - Data.Aeson.Encode.ByteString diff --git a/ghc-aeson.spec b/ghc-aeson.spec index cc26443..de1b256 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -12,8 +12,6 @@ Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -# for archs without ghci -Patch1: aeson-disable-TH.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -60,9 +58,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%ifnarch %{ghc_arches_with_ghci} -%patch1 -p1 -b .orig -%endif %build From 6ae943b4eddd6072b08076e1ae8c1f63293a4d29 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Aug 2016 10:18:04 +0900 Subject: [PATCH 24/62] update to cblrpm-0.10.0 --- ghc-aeson.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index de1b256..2fdb898 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,3 +1,4 @@ +# generated by cabal-rpm-0.10.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson @@ -67,11 +68,11 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel @@ -83,11 +84,11 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files -%doc README.markdown examples +%doc README.markdown changelog.md examples %changelog From aff55bb9b393df466800b3fb0bd214381e398b52 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:26 +0900 Subject: [PATCH 25/62] no longer remove license; use cabal_test --- ghc-aeson.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 2fdb898..a1422fa 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -68,8 +68,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check %cabal_test From 686818b184518b96f72a120fbbcfe22d7ba1a394 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:32:36 +0000 Subject: [PATCH 26/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a1422fa..7db46e6 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} Version: 0.8.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -90,6 +90,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.8.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.8.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1a679820d8f0305b9c813e2bc0c3145a1ef8133d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 01:28:07 +0900 Subject: [PATCH 27/62] update to 1.0.2.1; subpkg time-compat-locale subpkg was previously in snap-core --- .gitignore | 2 ++ ghc-aeson.spec | 39 ++++++++++++++++++++++++++++++++------- sources | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 98b47f1..e8cd205 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /aeson-0.6.1.0.tar.gz /aeson-0.6.2.1.tar.gz /aeson-0.8.0.2.tar.gz +/aeson-1.0.2.1.tar.gz +/time-locale-compat-0.1.1.3.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 7db46e6..27086f4 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,39 +1,49 @@ -# generated by cabal-rpm-0.10.0 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson +%global pkgver %{pkg_name}-%{version} + +%global timelocalecompat time-locale-compat-0.1.1.3 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.0.2 +Version: 1.0.2.1 Release: 5%{?dist} Summary: Fast JSON parsing and encoding 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 +Source1: https://hackage.haskell.org/package/%{timelocalecompat}/%{timelocalecompat}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel -BuildRequires: ghc-mtl-devel BuildRequires: ghc-scientific-devel -BuildRequires: ghc-syb-devel +BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +#BuildRequires: ghc-time-locale-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-orphans-devel +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-generic-deriving-devel +BuildRequires: ghc-hashable-time-devel +BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -57,15 +67,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{timelocalecompat} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{timelocalecompat} %ghc_lib_build %install +%ghc_libs_install %{timelocalecompat} %ghc_lib_install @@ -90,6 +111,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 21 2017 Jens Petersen - 1.0.2.1-5 +- update to 1.0.2.1 +- subpackage time-locale-compat + * Fri Feb 10 2017 Fedora Release Engineering - 0.8.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 4829922..8de3c02 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -33f09a236e47dfa87f5fb292f48d189a aeson-0.8.0.2.tar.gz +SHA512 (aeson-1.0.2.1.tar.gz) = 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e +SHA512 (time-locale-compat-0.1.1.3.tar.gz) = 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2 From ed38231efcc15078dddde5e6e909c2d340dcd968 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 13:13:36 +0900 Subject: [PATCH 28/62] use %subpkgs --- ghc-aeson.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 27086f4..5eb5db9 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -5,6 +5,7 @@ %global pkgver %{pkg_name}-%{version} %global timelocalecompat time-locale-compat-0.1.1.3 +%global subpkgs %{timelocalecompat} %bcond_with tests @@ -16,7 +17,7 @@ Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{timelocalecompat}/%{timelocalecompat}.tar.gz +Source1: https://hackage.haskell.org/package/%{subpkgs}/%{subpkgs}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -70,7 +71,7 @@ This package provides the Haskell %{pkg_name} library development files. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{timelocalecompat} +%ghc_lib_subpackage %{subpkgs} %endif %global version %{main_version} @@ -81,13 +82,14 @@ This package provides the Haskell %{pkg_name} library development files. %build -%ghc_libs_build %{timelocalecompat} +%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{timelocalecompat} +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} %check From d20c18c797c6a7e5963ee74584954a6a41be42fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:33:44 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 5eb5db9..3552607 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.0.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 21 2017 Jens Petersen - 1.0.2.1-5 - update to 1.0.2.1 - subpackage time-locale-compat From 0f39f57cac76ba299163f9afc2969b9393bd6109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:11:58 +0000 Subject: [PATCH 30/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 3552607..aec0136 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 1.0.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -113,6 +113,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.0.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 221b2213f0b8f2fbd969a937b5a35a0fd349192e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 15 Nov 2017 12:08:54 +0900 Subject: [PATCH 31/62] drop %ghc_fix_rpath and correct use of %subpkgs --- ghc-aeson.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index aec0136..7eb13b0 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -17,7 +17,7 @@ Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{subpkgs}/%{subpkgs}.tar.gz +Source1: https://hackage.haskell.org/package/%{timelocalecompat}/%{timelocalecompat}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -89,7 +89,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} %check From 5b631bdac81ca4a20b3c166623b2fff7153c9978 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 12 Jan 2018 11:10:59 +0900 Subject: [PATCH 32/62] time-locale-compat now packaged --- ghc-aeson.spec | 29 ++++++++++------------------- sources | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 7eb13b0..2d908ef 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,23 +1,19 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson %global pkgver %{pkg_name}-%{version} -%global timelocalecompat time-locale-compat-0.1.1.3 -%global subpkgs %{timelocalecompat} - %bcond_with tests Name: ghc-%{pkg_name} Version: 1.0.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{timelocalecompat}/%{timelocalecompat}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -34,7 +30,7 @@ BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel -#BuildRequires: ghc-time-locale-compat-devel +BuildRequires: ghc-time-locale-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -59,35 +55,27 @@ high performance. Aeson was the father of Jason in Greek mythology. %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 This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{subpkgs} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -112,6 +100,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 12 2018 Jens Petersen - 1.0.2.1-8 +- time-locale-compat is now packaged + * Wed Aug 02 2017 Fedora Release Engineering - 1.0.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8de3c02..7c03913 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (aeson-1.0.2.1.tar.gz) = 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e -SHA512 (time-locale-compat-0.1.1.3.tar.gz) = 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2 From ebe2b9dd6ea1d7244a41a59a7e826a1196c8f364 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Jan 2018 19:24:42 +0900 Subject: [PATCH 33/62] no longer need ghc-rpm-macros-extra --- ghc-aeson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 2d908ef..606983b 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -16,7 +16,7 @@ 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-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel From 294b059f50aaf71b417e3f1fb818076218da64fb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:30 +0100 Subject: [PATCH 34/62] refresh to cabal-rpm-0.12.1 --- ghc-aeson.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 2d908ef..bd40583 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson @@ -83,6 +83,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 f13423cad5d2455fca068e6a2327eb7d00c1e492 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:19:00 +0100 Subject: [PATCH 35/62] update to 1.2.3.0 --- .gitignore | 1 + ghc-aeson.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8cd205..8b9f7f4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /aeson-0.8.0.2.tar.gz /aeson-1.0.2.1.tar.gz /time-locale-compat-0.1.1.3.tar.gz +/aeson-1.2.3.0.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index bd40583..60ccd73 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.0.2.1 -Release: 8%{?dist} +Version: 1.2.3.0 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -29,17 +29,22 @@ BuildRequires: ghc-scientific-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel +BuildRequires: ghc-th-abstraction-devel BuildRequires: ghc-time-devel BuildRequires: ghc-time-locale-compat-devel BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-uuid-types-devel BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-generic-deriving-devel BuildRequires: ghc-hashable-time-devel +BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel @@ -106,6 +111,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 1.2.3.0-1 +- update to 1.2.3.0 + * Fri Jan 12 2018 Jens Petersen - 1.0.2.1-8 - time-locale-compat is now packaged diff --git a/sources b/sources index 7c03913..a2cf3ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.0.2.1.tar.gz) = 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e +SHA512 (aeson-1.2.3.0.tar.gz) = 756c230024010cacb5f8961ccbeda240e8fd04187cbb593605ee8709c6e8d6f20979d72e81fb05b5bcd5d36054a1c0b216c87bba8f2f4f914e80ff39a5a74659 From d778a5142bf2bb80a9f3414a017603a6f83f2e97 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:01:52 +0900 Subject: [PATCH 36/62] drop ldconfig scriptlets --- ghc-aeson.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a89041a..f7b0303 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -88,12 +88,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 9c02c689af23dc97055b59b9a5ee571e09a212fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:16:35 +0000 Subject: [PATCH 37/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index f7b0303..6603d37 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -105,6 +105,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 1.2.3.0-1 - update to 1.2.3.0 From 60f93f82541afb01216126c6c2d02883c3f3face Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:32:02 +0000 Subject: [PATCH 38/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 6603d37..7c7803e 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -105,6 +105,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 58311f5e9eb050d904831e200d27f4efe86738ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:37:47 +0200 Subject: [PATCH 39/62] Rebuilt for #1607054 --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 7c7803e..5d7cbbf 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -105,6 +105,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 23 2018 Miro Hrončok - 1.2.3.0-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 1.2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 50c2b266f85c6b9b098f97f11ed9e42c88271a07 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 17:56:40 +0900 Subject: [PATCH 40/62] update to 1.2.4.0 --- .gitignore | 1 + ghc-aeson.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8b9f7f4..ab1c2a1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /aeson-1.0.2.1.tar.gz /time-locale-compat-0.1.1.3.tar.gz /aeson-1.2.3.0.tar.gz +/aeson-1.2.4.0.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 5d7cbbf..b1f68a3 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3.0 -Release: 4%{?dist} +Version: 1.2.4.0 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -105,6 +105,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 1.2.4.0-1 +- update to 1.2.4.0 + * Mon Jul 23 2018 Miro Hrončok - 1.2.3.0-4 - Rebuilt for #1607054 diff --git a/sources b/sources index a2cf3ba..91cea7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.2.3.0.tar.gz) = 756c230024010cacb5f8961ccbeda240e8fd04187cbb593605ee8709c6e8d6f20979d72e81fb05b5bcd5d36054a1c0b216c87bba8f2f4f914e80ff39a5a74659 +SHA512 (aeson-1.2.4.0.tar.gz) = ece91b97de5c0a46818122fbc4e22e69ab79b4e0fe5ef55c1ab9e716be86c100b4c0f9270c1086adfe9d5fbc124fb68c025d13f1f2e2a765fb6cab88168f7155 From 212f83445e8368b2e17ac007f5d6714cd0400272 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:08:28 +0000 Subject: [PATCH 41/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index b1f68a3..fa9a36c 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -105,6 +105,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 1.2.4.0-1 - update to 1.2.4.0 From 7a1b59b1b4937cc96136478fca3410ee8897169e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:23 +0800 Subject: [PATCH 42/62] refresh to cabal-rpm-0.13 --- ghc-aeson.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index fa9a36c..5cc1147 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 1.2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding 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-base-compat-devel BuildRequires: ghc-bytestring-devel @@ -73,15 +75,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 @@ -97,7 +105,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 @@ -105,6 +115,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 1.2.4.0-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 1.2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 561be1b080dcd41f61a3d72f6d6060c13db1822a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 10:03:11 +0800 Subject: [PATCH 43/62] update to 1.3.1.1 --- .gitignore | 1 + ghc-aeson.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ab1c2a1..fc9fef3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /time-locale-compat-0.1.1.3.tar.gz /aeson-1.2.3.0.tar.gz /aeson-1.2.4.0.tar.gz +/aeson-1.3.1.1.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 5cc1147..0642c55 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.4.0 -Release: 3%{?dist} +Version: 1.3.1.1 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -48,9 +48,9 @@ BuildRequires: ghc-generic-deriving-devel BuildRequires: ghc-hashable-time-devel BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-quickcheck-instances-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps @@ -115,6 +115,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Feb 21 2019 Jens Petersen - 1.3.1.1-1 +- update to 1.3.1.1 + * Sun Feb 17 2019 Jens Petersen - 1.2.4.0-3 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 91cea7d..7179e8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.2.4.0.tar.gz) = ece91b97de5c0a46818122fbc4e22e69ab79b4e0fe5ef55c1ab9e716be86c100b4c0f9270c1086adfe9d5fbc124fb68c025d13f1f2e2a765fb6cab88168f7155 +SHA512 (aeson-1.3.1.1.tar.gz) = ab506e0aa453542c1b609e65d36ed56758c43b772c1eaa13274bf4f9e72366bdf02ba31de0a7a8673c7a0d200837dd0192e1269fbe51d3b7d0149dce6d0f6968 From 84697902973d71dbe5fdbd70f5833077e75fc2b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:04:27 +0000 Subject: [PATCH 44/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 0642c55..5ca149f 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -115,6 +115,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Jens Petersen - 1.3.1.1-1 - update to 1.3.1.1 From 610a25e1a567d87ab0e78fe1f376544d235b4d4c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:22 +0000 Subject: [PATCH 45/62] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-aeson.spec | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 5ca149f..645334c 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson @@ -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 BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel @@ -62,11 +68,8 @@ high performance. Aeson was the father of Jason in Greek mythology. %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} @@ -74,6 +77,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} @@ -96,14 +118,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 @@ -114,6 +128,16 @@ This package provides the Haskell %{pkg_name} library development files. %doc README.markdown changelog.md examples +%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.3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d73d70cdef019905a980a54ba68a76bff6549e06 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 15:09:31 +0000 Subject: [PATCH 46/62] update to 1.4.2.0 --- .gitignore | 1 + aeson-1.4.2.0.cabal | 261 ++++++++++++++++++++++++++++++++++++++++++++ ghc-aeson.spec | 12 +- sources | 2 +- 4 files changed, 272 insertions(+), 4 deletions(-) create mode 100644 aeson-1.4.2.0.cabal diff --git a/.gitignore b/.gitignore index fc9fef3..2e5b850 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /aeson-1.2.3.0.tar.gz /aeson-1.2.4.0.tar.gz /aeson-1.3.1.1.tar.gz +/aeson-1.4.2.0.tar.gz diff --git a/aeson-1.4.2.0.cabal b/aeson-1.4.2.0.cabal new file mode 100644 index 0000000..08cfe20 --- /dev/null +++ b/aeson-1.4.2.0.cabal @@ -0,0 +1,261 @@ +name: aeson +version: 1.4.2.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Text, Web, JSON +copyright: (c) 2011-2016 Bryan O'Sullivan + (c) 2011 MailRank, Inc. +author: Bryan O'Sullivan +maintainer: Adam Bergmark +stability: experimental +tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 +synopsis: Fast JSON parsing and encoding +cabal-version: >= 1.10 +homepage: https://github.com/bos/aeson +bug-reports: https://github.com/bos/aeson/issues +build-type: Simple +description: + A JSON parsing and encoding library optimized for ease of use + and high performance. + . + To get started, see the documentation for the @Data.Aeson@ module + below. + . + (A note on naming: in Greek mythology, Aeson was the father of Jason.) + +extra-source-files: + *.yaml + README.markdown + benchmarks/*.cabal + benchmarks/*.hs + benchmarks/*.py + benchmarks/Compare/*.hs + benchmarks/Makefile + benchmarks/Typed/*.hs + benchmarks/json-data/*.json + cbits/*.c + changelog.md + examples/*.cabal + examples/*.hs + examples/Twitter/*.hs + ffi/Data/Aeson/Parser/*.hs + include/*.h + tests/JSONTestSuite/test_parsing/*.json + tests/JSONTestSuite/test_transform/*.json + pure/Data/Aeson/Parser/*.hs + +flag developer + description: operate in developer mode + default: False + manual: True + +flag fast + description: compile without optimizations + default: False + manual: True + +flag bytestring-builder + description: Depend on the bytestring-builder package for backwards compatibility. + default: False + manual: False + +flag cffi + description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. + default: False + manual: True + +library + default-language: Haskell2010 + hs-source-dirs: . attoparsec-iso8601/ + + exposed-modules: + Data.Aeson + Data.Aeson.Encoding + Data.Aeson.Parser + Data.Aeson.Text + Data.Aeson.Types + Data.Aeson.TH + Data.Aeson.QQ.Simple + + Data.Aeson.Encoding.Internal + Data.Aeson.Internal + Data.Aeson.Internal.Time + Data.Aeson.Parser.Internal + + -- Deprecated modules + exposed-modules: + Data.Aeson.Encode + + other-modules: + Data.Aeson.Compat + Data.Aeson.Encoding.Builder + Data.Aeson.Internal.Functions + Data.Aeson.Parser.Unescape + Data.Aeson.Parser.Time + Data.Aeson.Types.FromJSON + Data.Aeson.Types.Generic + Data.Aeson.Types.ToJSON + Data.Aeson.Types.Class + Data.Aeson.Types.Internal + Data.Attoparsec.Time + Data.Attoparsec.Time.Internal + + -- GHC bundled libs + build-depends: + base >= 4.5.0.0 && < 5, + containers >= 0.4.2.1 && < 0.7, + deepseq >= 1.3.0.0 && < 1.5, + ghc-prim >= 0.2 && < 0.6, + template-haskell >= 2.7.0.0 && < 2.15, + text >= 1.2.3.0 && < 1.3, + time >= 1.4 && < 1.9 + + -- Compat + build-depends: + base-compat >= 0.9.1 && < 0.11 + + if flag(bytestring-builder) + build-depends: bytestring >= 0.9.2 && < 0.10.4, + bytestring-builder >= 0.10.4 && < 1 + else + build-depends: bytestring >= 0.10.4 && < 0.11 + + if !impl(ghc >= 8.6) + build-depends: + contravariant >=1.4.1 && <1.6 + + if !impl(ghc >= 8.0) + -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 + build-depends: + semigroups >= 0.18.5 && < 0.19, + transformers >= 0.3.0.0 && < 0.6, + transformers-compat >= 0.6.2 && < 0.7, + fail == 4.9.* + + if !impl(ghc >= 7.10) + -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 + build-depends: nats >= 1.1.1 && < 1.2, + void >= 0.7.2 && < 0.8 + + -- cannot use latest version + build-depends: + unordered-containers >= 0.2.8.0 && < 0.3, + + -- not in LTS-12.10 + tagged >= 0.8.5 && < 0.9, + primitive >= 0.6.3.0 && < 0.7 + + -- Other dependencies + build-depends: + attoparsec >= 0.13.2.2 && < 0.14, + dlist >= 0.8.0.4 && < 0.9, + hashable >= 1.2.7.0 && < 1.3, + scientific >= 0.3.6.2 && < 0.4, + th-abstraction >= 0.2.8.0 && < 0.3, + time-locale-compat >= 0.1.1.5 && < 0.2, + uuid-types >= 1.0.3 && < 1.1, + vector >= 0.12.0.1 && < 0.13 + + ghc-options: -Wall + + if flag(developer) + ghc-options: -Werror + ghc-prof-options: -auto-all + + if flag(fast) + ghc-options: -O0 + else + ghc-options: -O2 + + include-dirs: include + if impl(ghcjs) || !flag(cffi) + hs-source-dirs: pure + other-modules: Data.Aeson.Parser.UnescapePure + else + c-sources: cbits/unescape_string.c + cpp-options: -DCFFI + hs-source-dirs: ffi + other-modules: Data.Aeson.Parser.UnescapeFFI + +test-suite tests + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: tests ffi pure + main-is: Tests.hs + c-sources: cbits/unescape_string.c + ghc-options: -Wall -threaded -rtsopts + + other-modules: + Data.Aeson.Parser.UnescapeFFI + Data.Aeson.Parser.UnescapePure + DataFamilies.Properties + DataFamilies.Instances + DataFamilies.Encoders + DataFamilies.Types + Encoders + ErrorMessages + Functions + Instances + Options + Properties + SerializationFormatSpec + Types + UnitTests + UnitTests.NullaryConstructors + + build-depends: + QuickCheck >= 2.10.0.1 && < 2.12, + aeson, + integer-logarithms >= 1 && <1.1, + attoparsec, + base, + base-compat, + base-orphans >= 0.5.3 && <0.9, + base16-bytestring, + containers, + directory, + dlist, + filepath, + generic-deriving >= 1.10 && < 1.13, + ghc-prim >= 0.2, + hashable >= 1.2.4.0, + scientific, + tagged, + template-haskell, + tasty, + tasty-hunit, + tasty-quickcheck, + text, + time, + time-locale-compat, + unordered-containers, + uuid-types, + vector, + quickcheck-instances >= 0.3.16 + + if flag(bytestring-builder) + build-depends: bytestring >= 0.9 && < 0.10.4, + bytestring-builder >= 0.10.4 && < 1 + else + build-depends: bytestring >= 0.10.4 + + if !impl(ghc >= 8.0) + build-depends: + semigroups >= 0.18.2 && < 0.19, + transformers >= 0.2.2.0, + transformers-compat >= 0.3 + + if !impl(ghc >= 7.10) + build-depends: nats >=1 && <1.2, + void >=0.7.2 && <0.8 + + if impl(ghc >= 7.8) + build-depends: hashable-time >= 0.2 && <0.3 + + if flag(fast) + ghc-options: -fno-enable-rewrite-rules + +source-repository head + type: git + location: git://github.com/bos/aeson.git diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 645334c..ec6a036 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,14 +7,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.1.1 -Release: 2%{?dist} +Version: 1.4.2.0 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding 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: @@ -30,9 +31,11 @@ BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-contravariant-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel +BuildRequires: ghc-primitive-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel @@ -44,7 +47,6 @@ BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-uuid-types-devel BuildRequires: ghc-vector-devel %if %{with tests} -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-orphans-devel BuildRequires: ghc-base16-bytestring-devel @@ -99,6 +101,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 @@ -139,6 +142,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 1.4.2.0-1 +- update to 1.4.2.0 + * Thu Jul 25 2019 Fedora Release Engineering - 1.3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7179e8c..6976f08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.3.1.1.tar.gz) = ab506e0aa453542c1b609e65d36ed56758c43b772c1eaa13274bf4f9e72366bdf02ba31de0a7a8673c7a0d200837dd0192e1269fbe51d3b7d0149dce6d0f6968 +SHA512 (aeson-1.4.2.0.tar.gz) = b413a0f3c35e7598b297a622f744de4133d7f784893bfa274356c156f74aeeb37cc2344c7f2adf13d4c41403d07708f37bb93bfbc78edb9ea74dc297fadb15b7 From 6e5fb13e0c151a957800421432c7781628851fd0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:20 +0800 Subject: [PATCH 47/62] BR prof for lib and static for executable --- ghc-aeson.spec | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index ec6a036..3f7008f 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson @@ -20,32 +20,26 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # 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-base-compat-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-contravariant-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-dlist-devel -BuildRequires: ghc-hashable-devel -BuildRequires: ghc-primitive-devel -BuildRequires: ghc-scientific-devel -BuildRequires: ghc-tagged-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-th-abstraction-devel -BuildRequires: ghc-time-devel -BuildRequires: ghc-time-locale-compat-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-uuid-types-devel -BuildRequires: ghc-vector-devel +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-dlist-prof +BuildRequires: ghc-hashable-prof +BuildRequires: ghc-primitive-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-tagged-prof +BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-th-abstraction-prof +BuildRequires: ghc-time-prof +BuildRequires: ghc-time-locale-compat-prof +BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-uuid-types-prof +BuildRequires: ghc-vector-prof %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-base-orphans-devel @@ -70,6 +64,7 @@ high performance. Aeson was the father of Jason in Greek mythology. %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 bef6efd20b73eb36540d8f108466d312d4c856e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:14:02 +0000 Subject: [PATCH 48/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 3f7008f..8510ee1 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -137,6 +137,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 1.4.2.0-1 - update to 1.4.2.0 From 65edcce40ef9acea20c7c9864f4ddada39e0bd60 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:48:50 +0800 Subject: [PATCH 49/62] refresh to cabal-rpm-2.0.2 --- ghc-aeson.spec | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 8510ee1..5ae1b6f 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 1.4.2.0 Release: 2%{?dist} @@ -40,20 +38,6 @@ BuildRequires: ghc-time-locale-compat-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-uuid-types-prof BuildRequires: ghc-vector-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-base-orphans-devel -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-generic-deriving-devel -BuildRequires: ghc-hashable-time-devel -BuildRequires: ghc-integer-logarithms-devel -BuildRequires: ghc-quickcheck-instances-devel -BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel -BuildRequires: ghc-tasty-quickcheck-devel -%endif # End cabal-rpm deps %description @@ -77,6 +61,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. @@ -87,6 +72,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. @@ -112,8 +98,14 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -128,6 +120,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From f8ccfe50229abbcec175c95ec38340a406debc11 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 9 Feb 2020 21:51:00 +0800 Subject: [PATCH 50/62] update to 1.4.6.0 --- .gitignore | 1 + aeson-1.4.2.0.cabal | 261 -------------------------------------------- ghc-aeson.spec | 11 +- sources | 2 +- 4 files changed, 8 insertions(+), 267 deletions(-) delete mode 100644 aeson-1.4.2.0.cabal diff --git a/.gitignore b/.gitignore index 2e5b850..8631c76 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /aeson-1.2.4.0.tar.gz /aeson-1.3.1.1.tar.gz /aeson-1.4.2.0.tar.gz +/aeson-1.4.6.0.tar.gz diff --git a/aeson-1.4.2.0.cabal b/aeson-1.4.2.0.cabal deleted file mode 100644 index 08cfe20..0000000 --- a/aeson-1.4.2.0.cabal +++ /dev/null @@ -1,261 +0,0 @@ -name: aeson -version: 1.4.2.0 -x-revision: 1 -license: BSD3 -license-file: LICENSE -category: Text, Web, JSON -copyright: (c) 2011-2016 Bryan O'Sullivan - (c) 2011 MailRank, Inc. -author: Bryan O'Sullivan -maintainer: Adam Bergmark -stability: experimental -tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 -synopsis: Fast JSON parsing and encoding -cabal-version: >= 1.10 -homepage: https://github.com/bos/aeson -bug-reports: https://github.com/bos/aeson/issues -build-type: Simple -description: - A JSON parsing and encoding library optimized for ease of use - and high performance. - . - To get started, see the documentation for the @Data.Aeson@ module - below. - . - (A note on naming: in Greek mythology, Aeson was the father of Jason.) - -extra-source-files: - *.yaml - README.markdown - benchmarks/*.cabal - benchmarks/*.hs - benchmarks/*.py - benchmarks/Compare/*.hs - benchmarks/Makefile - benchmarks/Typed/*.hs - benchmarks/json-data/*.json - cbits/*.c - changelog.md - examples/*.cabal - examples/*.hs - examples/Twitter/*.hs - ffi/Data/Aeson/Parser/*.hs - include/*.h - tests/JSONTestSuite/test_parsing/*.json - tests/JSONTestSuite/test_transform/*.json - pure/Data/Aeson/Parser/*.hs - -flag developer - description: operate in developer mode - default: False - manual: True - -flag fast - description: compile without optimizations - default: False - manual: True - -flag bytestring-builder - description: Depend on the bytestring-builder package for backwards compatibility. - default: False - manual: False - -flag cffi - description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. - default: False - manual: True - -library - default-language: Haskell2010 - hs-source-dirs: . attoparsec-iso8601/ - - exposed-modules: - Data.Aeson - Data.Aeson.Encoding - Data.Aeson.Parser - Data.Aeson.Text - Data.Aeson.Types - Data.Aeson.TH - Data.Aeson.QQ.Simple - - Data.Aeson.Encoding.Internal - Data.Aeson.Internal - Data.Aeson.Internal.Time - Data.Aeson.Parser.Internal - - -- Deprecated modules - exposed-modules: - Data.Aeson.Encode - - other-modules: - Data.Aeson.Compat - Data.Aeson.Encoding.Builder - Data.Aeson.Internal.Functions - Data.Aeson.Parser.Unescape - Data.Aeson.Parser.Time - Data.Aeson.Types.FromJSON - Data.Aeson.Types.Generic - Data.Aeson.Types.ToJSON - Data.Aeson.Types.Class - Data.Aeson.Types.Internal - Data.Attoparsec.Time - Data.Attoparsec.Time.Internal - - -- GHC bundled libs - build-depends: - base >= 4.5.0.0 && < 5, - containers >= 0.4.2.1 && < 0.7, - deepseq >= 1.3.0.0 && < 1.5, - ghc-prim >= 0.2 && < 0.6, - template-haskell >= 2.7.0.0 && < 2.15, - text >= 1.2.3.0 && < 1.3, - time >= 1.4 && < 1.9 - - -- Compat - build-depends: - base-compat >= 0.9.1 && < 0.11 - - if flag(bytestring-builder) - build-depends: bytestring >= 0.9.2 && < 0.10.4, - bytestring-builder >= 0.10.4 && < 1 - else - build-depends: bytestring >= 0.10.4 && < 0.11 - - if !impl(ghc >= 8.6) - build-depends: - contravariant >=1.4.1 && <1.6 - - if !impl(ghc >= 8.0) - -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 - build-depends: - semigroups >= 0.18.5 && < 0.19, - transformers >= 0.3.0.0 && < 0.6, - transformers-compat >= 0.6.2 && < 0.7, - fail == 4.9.* - - if !impl(ghc >= 7.10) - -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 - build-depends: nats >= 1.1.1 && < 1.2, - void >= 0.7.2 && < 0.8 - - -- cannot use latest version - build-depends: - unordered-containers >= 0.2.8.0 && < 0.3, - - -- not in LTS-12.10 - tagged >= 0.8.5 && < 0.9, - primitive >= 0.6.3.0 && < 0.7 - - -- Other dependencies - build-depends: - attoparsec >= 0.13.2.2 && < 0.14, - dlist >= 0.8.0.4 && < 0.9, - hashable >= 1.2.7.0 && < 1.3, - scientific >= 0.3.6.2 && < 0.4, - th-abstraction >= 0.2.8.0 && < 0.3, - time-locale-compat >= 0.1.1.5 && < 0.2, - uuid-types >= 1.0.3 && < 1.1, - vector >= 0.12.0.1 && < 0.13 - - ghc-options: -Wall - - if flag(developer) - ghc-options: -Werror - ghc-prof-options: -auto-all - - if flag(fast) - ghc-options: -O0 - else - ghc-options: -O2 - - include-dirs: include - if impl(ghcjs) || !flag(cffi) - hs-source-dirs: pure - other-modules: Data.Aeson.Parser.UnescapePure - else - c-sources: cbits/unescape_string.c - cpp-options: -DCFFI - hs-source-dirs: ffi - other-modules: Data.Aeson.Parser.UnescapeFFI - -test-suite tests - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: tests ffi pure - main-is: Tests.hs - c-sources: cbits/unescape_string.c - ghc-options: -Wall -threaded -rtsopts - - other-modules: - Data.Aeson.Parser.UnescapeFFI - Data.Aeson.Parser.UnescapePure - DataFamilies.Properties - DataFamilies.Instances - DataFamilies.Encoders - DataFamilies.Types - Encoders - ErrorMessages - Functions - Instances - Options - Properties - SerializationFormatSpec - Types - UnitTests - UnitTests.NullaryConstructors - - build-depends: - QuickCheck >= 2.10.0.1 && < 2.12, - aeson, - integer-logarithms >= 1 && <1.1, - attoparsec, - base, - base-compat, - base-orphans >= 0.5.3 && <0.9, - base16-bytestring, - containers, - directory, - dlist, - filepath, - generic-deriving >= 1.10 && < 1.13, - ghc-prim >= 0.2, - hashable >= 1.2.4.0, - scientific, - tagged, - template-haskell, - tasty, - tasty-hunit, - tasty-quickcheck, - text, - time, - time-locale-compat, - unordered-containers, - uuid-types, - vector, - quickcheck-instances >= 0.3.16 - - if flag(bytestring-builder) - build-depends: bytestring >= 0.9 && < 0.10.4, - bytestring-builder >= 0.10.4 && < 1 - else - build-depends: bytestring >= 0.10.4 - - if !impl(ghc >= 8.0) - build-depends: - semigroups >= 0.18.2 && < 0.19, - transformers >= 0.2.2.0, - transformers-compat >= 0.3 - - if !impl(ghc >= 7.10) - build-depends: nats >=1 && <1.2, - void >=0.7.2 && <0.8 - - if impl(ghc >= 7.8) - build-depends: hashable-time >= 0.2 && <0.3 - - if flag(fast) - ghc-options: -fno-enable-rewrite-rules - -source-repository head - type: git - location: git://github.com/bos/aeson.git diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 5ae1b6f..3b49abb 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -5,15 +5,14 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.4.2.0 -Release: 2%{?dist} +Version: 1.4.6.0 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding 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: @@ -34,7 +33,7 @@ BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-prof BuildRequires: ghc-th-abstraction-prof BuildRequires: ghc-time-prof -BuildRequires: ghc-time-locale-compat-prof +BuildRequires: ghc-time-compat-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-uuid-types-prof BuildRequires: ghc-vector-prof @@ -82,7 +81,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 # End cabal-rpm setup @@ -130,6 +128,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Feb 09 2020 Jens Petersen - 1.4.6.0-1 +- update to 1.4.6.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.4.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6976f08..7347b8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.4.2.0.tar.gz) = b413a0f3c35e7598b297a622f744de4133d7f784893bfa274356c156f74aeeb37cc2344c7f2adf13d4c41403d07708f37bb93bfbc78edb9ea74dc297fadb15b7 +SHA512 (aeson-1.4.6.0.tar.gz) = b6fecd4cb75d0c296a1b4583c32cc57e6eb70248999bf16b83ecbb80b03b0656b7cfb410a2b1ae0005e2a4b6202c7aa227c6165d660fefbd270fd4ade8bd8ca6 From b1707a208ede8c9bc90dbd08fea737ca0b516668 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:07 +0800 Subject: [PATCH 51/62] refresh to cabal-rpm-2.0.5 --- ghc-aeson.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 3b49abb..0d71f19 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson %global pkgver %{pkg_name}-%{version} @@ -93,6 +93,7 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x README.markdown changelog.md # End cabal-rpm install From 0bdd66380484ec3d3f707d3d181a8a30ba9151ea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 00:08:37 +0800 Subject: [PATCH 52/62] update to 1.4.7.1 --- .gitignore | 1 + aeson-1.4.7.1.cabal | 267 ++++++++++++++++++++++++++++++++++++++++++++ ghc-aeson.spec | 10 +- sources | 2 +- 4 files changed, 276 insertions(+), 4 deletions(-) create mode 100644 aeson-1.4.7.1.cabal diff --git a/.gitignore b/.gitignore index 8631c76..721cb68 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /aeson-1.3.1.1.tar.gz /aeson-1.4.2.0.tar.gz /aeson-1.4.6.0.tar.gz +/aeson-1.4.7.1.tar.gz diff --git a/aeson-1.4.7.1.cabal b/aeson-1.4.7.1.cabal new file mode 100644 index 0000000..9a8bb51 --- /dev/null +++ b/aeson-1.4.7.1.cabal @@ -0,0 +1,267 @@ +name: aeson +version: 1.4.7.1 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Text, Web, JSON +copyright: (c) 2011-2016 Bryan O'Sullivan + (c) 2011 MailRank, Inc. +author: Bryan O'Sullivan +maintainer: Adam Bergmark +stability: experimental +tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 +synopsis: Fast JSON parsing and encoding +cabal-version: >= 1.10 +homepage: https://github.com/bos/aeson +bug-reports: https://github.com/bos/aeson/issues +build-type: Simple +description: + A JSON parsing and encoding library optimized for ease of use + and high performance. + . + To get started, see the documentation for the @Data.Aeson@ module + below. + . + (A note on naming: in Greek mythology, Aeson was the father of Jason.) + +extra-source-files: + *.yaml + README.markdown + benchmarks/*.cabal + benchmarks/*.hs + benchmarks/*.py + benchmarks/Compare/*.hs + benchmarks/Makefile + benchmarks/Typed/*.hs + benchmarks/json-data/*.json + cbits/*.c + changelog.md + examples/*.cabal + examples/*.hs + examples/Twitter/*.hs + ffi/Data/Aeson/Parser/*.hs + include/*.h + tests/JSONTestSuite/test_parsing/*.json + tests/JSONTestSuite/test_transform/*.json + tests/golden/*.expected + pure/Data/Aeson/Parser/*.hs + +flag developer + description: operate in developer mode + default: False + manual: True + +flag fast + description: compile without optimizations + default: False + manual: True + +flag bytestring-builder + description: Depend on the bytestring-builder package for backwards compatibility. + default: False + manual: False + +flag cffi + description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. + default: False + manual: True + +library + default-language: Haskell2010 + hs-source-dirs: . attoparsec-iso8601/ + + exposed-modules: + Data.Aeson + Data.Aeson.Encoding + Data.Aeson.Parser + Data.Aeson.Text + Data.Aeson.Types + Data.Aeson.TH + Data.Aeson.QQ.Simple + + Data.Aeson.Encoding.Internal + Data.Aeson.Internal + Data.Aeson.Internal.Time + Data.Aeson.Parser.Internal + + -- Deprecated modules + exposed-modules: + Data.Aeson.Encode + + other-modules: + Data.Aeson.Encoding.Builder + Data.Aeson.Internal.Functions + Data.Aeson.Parser.Unescape + Data.Aeson.Parser.Time + Data.Aeson.Types.FromJSON + Data.Aeson.Types.Generic + Data.Aeson.Types.ToJSON + Data.Aeson.Types.Class + Data.Aeson.Types.Internal + Data.Attoparsec.Time + Data.Attoparsec.Time.Internal + + -- GHC bundled libs + build-depends: + base >= 4.7.0.0 && < 5, + bytestring >= 0.10.4.0 && < 0.11, + containers >= 0.5.5.1 && < 0.7, + deepseq >= 1.3.0.0 && < 1.5, + ghc-prim >= 0.2 && < 0.7, + template-haskell >= 2.9.0.0 && < 2.17, + text >= 1.2.3.0 && < 1.3, + time >= 1.4 && < 1.11 + + if impl(ghc >= 8.0) + build-depends: bytestring >= 0.10.8.1 + + -- Compat + build-depends: + base-compat-batteries >= 0.10.0 && < 0.12, + time-compat >= 1.9.2.2 && < 1.10 + + if !impl(ghc >= 8.6) + build-depends: + contravariant >=1.4.1 && <1.6 + + if !impl(ghc >= 8.0) + -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 + build-depends: + semigroups >= 0.18.5 && < 0.20, + transformers >= 0.3.0.0 && < 0.6, + transformers-compat >= 0.6.2 && < 0.7, + fail == 4.9.* + + if !impl(ghc >= 7.10) + -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 + build-depends: nats >= 1.1.1 && < 1.2, + void >= 0.7.2 && < 0.8 + + -- cannot use latest version + build-depends: + unordered-containers >= 0.2.8.0 && < 0.3, + + -- not in LTS-12.10 + tagged >= 0.8.5 && < 0.9, + primitive >= 0.6.3.0 && < 0.8 + + -- Other dependencies + build-depends: + attoparsec >= 0.13.2.2 && < 0.14, + dlist >= 0.8.0.4 && < 0.9, + hashable >= 1.2.7.0 && < 1.4, + scientific >= 0.3.6.2 && < 0.4, + th-abstraction >= 0.2.8.0 && < 0.4, + uuid-types >= 1.0.3 && < 1.1, + vector >= 0.12.0.1 && < 0.13 + + ghc-options: -Wall + + if flag(developer) + ghc-options: -Werror + ghc-prof-options: -auto-all + + if flag(fast) + ghc-options: -O0 + else + ghc-options: -O2 + + include-dirs: include + if impl(ghcjs) || !flag(cffi) + hs-source-dirs: pure + other-modules: Data.Aeson.Parser.UnescapePure + else + c-sources: cbits/unescape_string.c + cpp-options: -DCFFI + hs-source-dirs: ffi + other-modules: Data.Aeson.Parser.UnescapeFFI + +test-suite tests + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: tests ffi pure + main-is: Tests.hs + c-sources: cbits/unescape_string.c + ghc-options: -Wall -threaded -rtsopts + + other-modules: + Data.Aeson.Parser.UnescapeFFI + Data.Aeson.Parser.UnescapePure + DataFamilies.Properties + DataFamilies.Instances + DataFamilies.Encoders + DataFamilies.Types + Encoders + ErrorMessages + Functions + Instances + Options + PropUtils + Properties + PropertyGeneric + PropertyKeys + PropertyRoundTrip + PropertyRTFunctors + PropertyTH + SerializationFormatSpec + Types + UnitTests + UnitTests.NullaryConstructors + + build-depends: + QuickCheck >= 2.10.0.1 && < 2.14, + aeson, + integer-logarithms >= 1 && <1.1, + attoparsec, + base, + base-compat, + base-orphans >= 0.5.3 && <0.9, + base16-bytestring, + containers, + directory, + dlist, + Diff >= 0.4 && < 0.5, + filepath, + generic-deriving >= 1.10 && < 1.14, + ghc-prim >= 0.2, + hashable >= 1.2.4.0, + scientific, + tagged, + template-haskell, + tasty, + tasty-golden, + tasty-hunit, + tasty-quickcheck, + text, + time, + time-compat, + unordered-containers, + uuid-types, + vector, + quickcheck-instances >= 0.3.21 && <0.4 + + if flag(bytestring-builder) + build-depends: bytestring >= 0.9 && < 0.10.4, + bytestring-builder >= 0.10.4 && < 1 + else + build-depends: bytestring >= 0.10.4 + + if !impl(ghc >= 8.0) + build-depends: + semigroups >= 0.18.2 && < 0.20, + transformers >= 0.2.2.0, + transformers-compat >= 0.3 + + if !impl(ghc >= 7.10) + build-depends: nats >=1 && <1.2, + void >=0.7.2 && <0.8 + + if impl(ghc >= 7.8) + build-depends: hashable-time >= 0.2 && <0.3 + + if flag(fast) + ghc-options: -fno-enable-rewrite-rules + +source-repository head + type: git + location: git://github.com/bos/aeson.git diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 0d71f19..c66f4ca 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -5,7 +5,7 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.4.6.0 +Version: 1.4.7.1 Release: 1%{?dist} Summary: Fast JSON parsing and encoding @@ -13,6 +13,7 @@ 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: @@ -20,7 +21,7 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-prof -BuildRequires: ghc-base-compat-prof +BuildRequires: ghc-base-compat-batteries-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-prof @@ -81,6 +82,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 @@ -93,7 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install -chmod a-x README.markdown changelog.md # End cabal-rpm install @@ -129,6 +130,9 @@ chmod a-x README.markdown changelog.md %changelog +* Sun Jun 07 2020 Jens Petersen - 1.4.7.1-1 +- update to 1.4.7.1 + * Sun Feb 09 2020 Jens Petersen - 1.4.6.0-1 - update to 1.4.6.0 diff --git a/sources b/sources index 7347b8c..243310e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.4.6.0.tar.gz) = b6fecd4cb75d0c296a1b4583c32cc57e6eb70248999bf16b83ecbb80b03b0656b7cfb410a2b1ae0005e2a4b6202c7aa227c6165d660fefbd270fd4ade8bd8ca6 +SHA512 (aeson-1.4.7.1.tar.gz) = 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705 From eea1fd86150f569c5307305e57f1253b771b5be3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:43 +0800 Subject: [PATCH 53/62] refresh to cabal-rpm-2.0.6 --- ghc-aeson.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index c66f4ca..847c682 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: hashable-time quickcheck-instances tasty-golden + Name: ghc-%{pkg_name} Version: 1.4.7.1 Release: 1%{?dist} @@ -98,16 +100,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # 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 9550735c0345f39d8f115fceb5ba4b132a2591b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:45:49 +0000 Subject: [PATCH 54/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 847c682..fe34029 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -122,6 +122,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Jens Petersen - 1.4.7.1-1 - update to 1.4.7.1 From d68d11c5c8338762cdc8005d67899b81b1d1a67a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:49:53 +0000 Subject: [PATCH 55/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index fe34029..befa1c4 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -122,6 +122,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 384aaf17f663ae99736c7b1a5e35785daf450faf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:16:30 +0000 Subject: [PATCH 56/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index befa1c4..a259025 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.4.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -122,6 +122,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.4.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.4.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From eaaa372d29fed564963a3225e8b78246a2e23eb1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Jan 2021 15:04:35 +0800 Subject: [PATCH 57/62] update to 1.5.5.1 --- .gitignore | 1 + aeson-1.4.7.1.cabal | 267 -------------------------------------------- ghc-aeson.spec | 14 ++- sources | 2 +- 4 files changed, 11 insertions(+), 273 deletions(-) delete mode 100644 aeson-1.4.7.1.cabal diff --git a/.gitignore b/.gitignore index 721cb68..e0c7f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /aeson-1.4.2.0.tar.gz /aeson-1.4.6.0.tar.gz /aeson-1.4.7.1.tar.gz +/aeson-1.5.5.1.tar.gz diff --git a/aeson-1.4.7.1.cabal b/aeson-1.4.7.1.cabal deleted file mode 100644 index 9a8bb51..0000000 --- a/aeson-1.4.7.1.cabal +++ /dev/null @@ -1,267 +0,0 @@ -name: aeson -version: 1.4.7.1 -x-revision: 1 -license: BSD3 -license-file: LICENSE -category: Text, Web, JSON -copyright: (c) 2011-2016 Bryan O'Sullivan - (c) 2011 MailRank, Inc. -author: Bryan O'Sullivan -maintainer: Adam Bergmark -stability: experimental -tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 -synopsis: Fast JSON parsing and encoding -cabal-version: >= 1.10 -homepage: https://github.com/bos/aeson -bug-reports: https://github.com/bos/aeson/issues -build-type: Simple -description: - A JSON parsing and encoding library optimized for ease of use - and high performance. - . - To get started, see the documentation for the @Data.Aeson@ module - below. - . - (A note on naming: in Greek mythology, Aeson was the father of Jason.) - -extra-source-files: - *.yaml - README.markdown - benchmarks/*.cabal - benchmarks/*.hs - benchmarks/*.py - benchmarks/Compare/*.hs - benchmarks/Makefile - benchmarks/Typed/*.hs - benchmarks/json-data/*.json - cbits/*.c - changelog.md - examples/*.cabal - examples/*.hs - examples/Twitter/*.hs - ffi/Data/Aeson/Parser/*.hs - include/*.h - tests/JSONTestSuite/test_parsing/*.json - tests/JSONTestSuite/test_transform/*.json - tests/golden/*.expected - pure/Data/Aeson/Parser/*.hs - -flag developer - description: operate in developer mode - default: False - manual: True - -flag fast - description: compile without optimizations - default: False - manual: True - -flag bytestring-builder - description: Depend on the bytestring-builder package for backwards compatibility. - default: False - manual: False - -flag cffi - description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. - default: False - manual: True - -library - default-language: Haskell2010 - hs-source-dirs: . attoparsec-iso8601/ - - exposed-modules: - Data.Aeson - Data.Aeson.Encoding - Data.Aeson.Parser - Data.Aeson.Text - Data.Aeson.Types - Data.Aeson.TH - Data.Aeson.QQ.Simple - - Data.Aeson.Encoding.Internal - Data.Aeson.Internal - Data.Aeson.Internal.Time - Data.Aeson.Parser.Internal - - -- Deprecated modules - exposed-modules: - Data.Aeson.Encode - - other-modules: - Data.Aeson.Encoding.Builder - Data.Aeson.Internal.Functions - Data.Aeson.Parser.Unescape - Data.Aeson.Parser.Time - Data.Aeson.Types.FromJSON - Data.Aeson.Types.Generic - Data.Aeson.Types.ToJSON - Data.Aeson.Types.Class - Data.Aeson.Types.Internal - Data.Attoparsec.Time - Data.Attoparsec.Time.Internal - - -- GHC bundled libs - build-depends: - base >= 4.7.0.0 && < 5, - bytestring >= 0.10.4.0 && < 0.11, - containers >= 0.5.5.1 && < 0.7, - deepseq >= 1.3.0.0 && < 1.5, - ghc-prim >= 0.2 && < 0.7, - template-haskell >= 2.9.0.0 && < 2.17, - text >= 1.2.3.0 && < 1.3, - time >= 1.4 && < 1.11 - - if impl(ghc >= 8.0) - build-depends: bytestring >= 0.10.8.1 - - -- Compat - build-depends: - base-compat-batteries >= 0.10.0 && < 0.12, - time-compat >= 1.9.2.2 && < 1.10 - - if !impl(ghc >= 8.6) - build-depends: - contravariant >=1.4.1 && <1.6 - - if !impl(ghc >= 8.0) - -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 - build-depends: - semigroups >= 0.18.5 && < 0.20, - transformers >= 0.3.0.0 && < 0.6, - transformers-compat >= 0.6.2 && < 0.7, - fail == 4.9.* - - if !impl(ghc >= 7.10) - -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 - build-depends: nats >= 1.1.1 && < 1.2, - void >= 0.7.2 && < 0.8 - - -- cannot use latest version - build-depends: - unordered-containers >= 0.2.8.0 && < 0.3, - - -- not in LTS-12.10 - tagged >= 0.8.5 && < 0.9, - primitive >= 0.6.3.0 && < 0.8 - - -- Other dependencies - build-depends: - attoparsec >= 0.13.2.2 && < 0.14, - dlist >= 0.8.0.4 && < 0.9, - hashable >= 1.2.7.0 && < 1.4, - scientific >= 0.3.6.2 && < 0.4, - th-abstraction >= 0.2.8.0 && < 0.4, - uuid-types >= 1.0.3 && < 1.1, - vector >= 0.12.0.1 && < 0.13 - - ghc-options: -Wall - - if flag(developer) - ghc-options: -Werror - ghc-prof-options: -auto-all - - if flag(fast) - ghc-options: -O0 - else - ghc-options: -O2 - - include-dirs: include - if impl(ghcjs) || !flag(cffi) - hs-source-dirs: pure - other-modules: Data.Aeson.Parser.UnescapePure - else - c-sources: cbits/unescape_string.c - cpp-options: -DCFFI - hs-source-dirs: ffi - other-modules: Data.Aeson.Parser.UnescapeFFI - -test-suite tests - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: tests ffi pure - main-is: Tests.hs - c-sources: cbits/unescape_string.c - ghc-options: -Wall -threaded -rtsopts - - other-modules: - Data.Aeson.Parser.UnescapeFFI - Data.Aeson.Parser.UnescapePure - DataFamilies.Properties - DataFamilies.Instances - DataFamilies.Encoders - DataFamilies.Types - Encoders - ErrorMessages - Functions - Instances - Options - PropUtils - Properties - PropertyGeneric - PropertyKeys - PropertyRoundTrip - PropertyRTFunctors - PropertyTH - SerializationFormatSpec - Types - UnitTests - UnitTests.NullaryConstructors - - build-depends: - QuickCheck >= 2.10.0.1 && < 2.14, - aeson, - integer-logarithms >= 1 && <1.1, - attoparsec, - base, - base-compat, - base-orphans >= 0.5.3 && <0.9, - base16-bytestring, - containers, - directory, - dlist, - Diff >= 0.4 && < 0.5, - filepath, - generic-deriving >= 1.10 && < 1.14, - ghc-prim >= 0.2, - hashable >= 1.2.4.0, - scientific, - tagged, - template-haskell, - tasty, - tasty-golden, - tasty-hunit, - tasty-quickcheck, - text, - time, - time-compat, - unordered-containers, - uuid-types, - vector, - quickcheck-instances >= 0.3.21 && <0.4 - - if flag(bytestring-builder) - build-depends: bytestring >= 0.9 && < 0.10.4, - bytestring-builder >= 0.10.4 && < 1 - else - build-depends: bytestring >= 0.10.4 - - if !impl(ghc >= 8.0) - build-depends: - semigroups >= 0.18.2 && < 0.20, - transformers >= 0.2.2.0, - transformers-compat >= 0.3 - - if !impl(ghc >= 7.10) - build-depends: nats >=1 && <1.2, - void >=0.7.2 && <0.8 - - if impl(ghc >= 7.8) - build-depends: hashable-time >= 0.2 && <0.3 - - if flag(fast) - ghc-options: -fno-enable-rewrite-rules - -source-repository head - type: git - location: git://github.com/bos/aeson.git diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a259025..3002b2d 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,15 +7,14 @@ # testsuite missing deps: hashable-time quickcheck-instances tasty-golden Name: ghc-%{pkg_name} -Version: 1.4.7.1 -Release: 4%{?dist} +Version: 1.5.5.1 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding 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,15 +25,18 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-base-compat-batteries-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-fix-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-dlist-prof BuildRequires: ghc-hashable-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-scientific-prof +BuildRequires: ghc-strict-prof BuildRequires: ghc-tagged-prof BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-text-prof BuildRequires: ghc-th-abstraction-prof +BuildRequires: ghc-these-prof BuildRequires: ghc-time-prof BuildRequires: ghc-time-compat-prof BuildRequires: ghc-unordered-containers-prof @@ -84,7 +86,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 # End cabal-rpm setup @@ -107,7 +108,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files -%doc README.markdown changelog.md examples +%doc README.markdown changelog.md %if %{with haddock} @@ -122,6 +123,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 1.5.5.1-1 +- update to 1.5.5.1 + * Thu Jul 22 2021 Fedora Release Engineering - 1.4.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 243310e..b498eef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.4.7.1.tar.gz) = 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705 +SHA512 (aeson-1.5.5.1.tar.gz) = 5bf3fed752dc601d9cc868d25d44898c8f5c2cc8ac5bc24b20ca2a56af66b776f02d2fc312c54d351931132d342b85215d2f5a211c87b77e043834a63ede6e0a From 92763c9104571dadd74a6df1ff385954ca8f4e48 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 58/62] refresh to cabal-rpm-2.0.9 --- ghc-aeson.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 3002b2d..be728e5 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.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 aeson @@ -66,6 +66,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. From c2ebe45f8f24b033ec84262236c303aef1adb780 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 01:51:01 +0800 Subject: [PATCH 59/62] update to 1.5.6.0 --- .gitignore | 1 + aeson-1.5.6.0.cabal | 258 ++++++++++++++++++++++++++++++++++++++++++++ ghc-aeson.spec | 7 +- sources | 2 +- 4 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 aeson-1.5.6.0.cabal diff --git a/.gitignore b/.gitignore index e0c7f1a..45cc6b4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /aeson-1.4.6.0.tar.gz /aeson-1.4.7.1.tar.gz /aeson-1.5.5.1.tar.gz +/aeson-1.5.6.0.tar.gz diff --git a/aeson-1.5.6.0.cabal b/aeson-1.5.6.0.cabal new file mode 100644 index 0000000..60c665e --- /dev/null +++ b/aeson-1.5.6.0.cabal @@ -0,0 +1,258 @@ +name: aeson +version: 1.5.6.0 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Text, Web, JSON +copyright: (c) 2011-2016 Bryan O'Sullivan + (c) 2011 MailRank, Inc. +author: Bryan O'Sullivan +maintainer: Adam Bergmark +stability: experimental +tested-with: 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 +synopsis: Fast JSON parsing and encoding +cabal-version: >= 1.10 +homepage: https://github.com/haskell/aeson +bug-reports: https://github.com/haskell/aeson/issues +build-type: Simple +description: + A JSON parsing and encoding library optimized for ease of use + and high performance. + . + To get started, see the documentation for the @Data.Aeson@ module + below. + . + (A note on naming: in Greek mythology, Aeson was the father of Jason.) + +extra-source-files: + *.yaml + README.markdown + cbits/*.c + changelog.md + include/*.h + tests/JSONTestSuite/test_parsing/*.json + tests/JSONTestSuite/test_transform/*.json + tests/golden/*.expected + src-ffi/Data/Aeson/Parser/*.hs + src-pure/Data/Aeson/Parser/*.hs + benchmarks/json-data/*.json + +flag developer + description: operate in developer mode + default: False + manual: True + +flag fast + description: compile without optimizations + default: False + manual: True + +flag bytestring-builder + description: Depend on the bytestring-builder package for backwards compatibility. + default: False + manual: False + +flag cffi + description: Controls whether to include c-ffi bits or pure haskell. Default to False for security. + default: False + manual: True + +library + default-language: Haskell2010 + hs-source-dirs: src attoparsec-iso8601/src + + exposed-modules: + Data.Aeson + Data.Aeson.Encoding + Data.Aeson.Parser + Data.Aeson.Text + Data.Aeson.Types + Data.Aeson.TH + Data.Aeson.QQ.Simple + + Data.Aeson.Encoding.Internal + Data.Aeson.Internal + Data.Aeson.Internal.Time + Data.Aeson.Parser.Internal + + -- Deprecated modules + exposed-modules: + Data.Aeson.Encode + + other-modules: + Data.Aeson.Encoding.Builder + Data.Aeson.Internal.Functions + Data.Aeson.Parser.Unescape + Data.Aeson.Parser.Time + Data.Aeson.Types.FromJSON + Data.Aeson.Types.Generic + Data.Aeson.Types.ToJSON + Data.Aeson.Types.Class + Data.Aeson.Types.Internal + Data.Attoparsec.Time + Data.Attoparsec.Time.Internal + + -- GHC bundled libs + build-depends: + base >= 4.7.0.0 && < 5, + bytestring >= 0.10.4.0 && < 0.12, + containers >= 0.5.5.1 && < 0.7, + deepseq >= 1.3.0.0 && < 1.5, + ghc-prim >= 0.2 && < 0.8, + template-haskell >= 2.9.0.0 && < 2.18, + text >= 1.2.3.0 && < 1.3, + time >= 1.4 && < 1.12 + + if impl(ghc >= 8.0) + build-depends: bytestring >= 0.10.8.1 + + -- Compat + build-depends: + base-compat-batteries >= 0.10.0 && < 0.12, + time-compat >= 1.9.4 && < 1.10 + + if !impl(ghc >= 8.6) + build-depends: + contravariant >=1.4.1 && <1.6 + + if !impl(ghc >= 8.0) + -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 + build-depends: + semigroups >= 0.18.5 && < 0.20, + transformers >= 0.3.0.0 && < 0.6, + transformers-compat >= 0.6.2 && < 0.7, + fail == 4.9.* + + if !impl(ghc >= 7.10) + -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8 + build-depends: nats >= 1.1.1 && < 1.2, + void >= 0.7.2 && < 0.8 + + -- Other dependencies + build-depends: + attoparsec >= 0.13.2.2 && < 0.15, + data-fix >= 0.3 && < 0.4, + dlist >= 0.8.0.4 && < 1.1, + hashable >= 1.2.7.0 && < 1.4, + primitive >= 0.7.0.1 && < 0.8, + scientific >= 0.3.6.2 && < 0.4, + strict >= 0.4 && < 0.5, + tagged >= 0.8.6 && < 0.9, + th-abstraction >= 0.2.8.0 && < 0.5, + these >= 1.1 && < 1.2, + unordered-containers >= 0.2.10.0 && < 0.3, + uuid-types >= 1.0.3 && < 1.1, + vector >= 0.12.0.1 && < 0.13 + + ghc-options: -Wall + + if flag(developer) + ghc-options: -Werror + ghc-prof-options: -auto-all + + if flag(fast) + ghc-options: -O0 + else + ghc-options: -O2 + + include-dirs: include + if impl(ghcjs) || !flag(cffi) + hs-source-dirs: src-pure + other-modules: Data.Aeson.Parser.UnescapePure + else + c-sources: cbits/unescape_string.c + cpp-options: -DCFFI + hs-source-dirs: src-ffi + other-modules: Data.Aeson.Parser.UnescapeFFI + +test-suite aeson-tests + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: tests src-ffi src-pure + main-is: Tests.hs + c-sources: cbits/unescape_string.c + ghc-options: -Wall -threaded -rtsopts + + other-modules: + Data.Aeson.Parser.UnescapeFFI + Data.Aeson.Parser.UnescapePure + DataFamilies.Properties + DataFamilies.Instances + DataFamilies.Encoders + DataFamilies.Types + Encoders + ErrorMessages + Functions + Instances + Options + PropUtils + Properties + PropertyGeneric + PropertyKeys + PropertyRoundTrip + PropertyRTFunctors + PropertyTH + SerializationFormatSpec + Types + UnitTests + UnitTests.NullaryConstructors + + build-depends: + QuickCheck >= 2.14.2 && < 2.15, + aeson, + integer-logarithms >= 1 && <1.1, + attoparsec, + base, + base-compat, + base-orphans >= 0.5.3 && <0.9, + base16-bytestring, + containers, + data-fix, + directory, + dlist, + Diff >= 0.4 && < 0.5, + filepath, + generic-deriving >= 1.10 && < 1.15, + ghc-prim >= 0.2, + hashable >= 1.2.4.0, + hashable-time >= 0.2.1 && <0.3, + scientific, + strict, + tagged, + template-haskell, + tasty, + tasty-golden, + tasty-hunit, + tasty-quickcheck, + text, + these, + time, + time-compat, + unordered-containers, + uuid-types, + vector, + quickcheck-instances >= 0.3.25.2 && <0.4 + + if flag(bytestring-builder) + build-depends: bytestring >= 0.9 && < 0.10.4, + bytestring-builder >= 0.10.4 && < 1 + else + build-depends: bytestring >= 0.10.4 + + if !impl(ghc >= 8.0) + build-depends: + semigroups >= 0.18.2 && < 0.20, + transformers >= 0.2.2.0, + transformers-compat >= 0.3 + + if !impl(ghc >= 7.10) + build-depends: nats >=1 && <1.2, + void >=0.7.2 && <0.8 + + + if flag(fast) + ghc-options: -fno-enable-rewrite-rules + +source-repository head + type: git + location: git://github.com/haskell/aeson.git diff --git a/ghc-aeson.spec b/ghc-aeson.spec index be728e5..a196769 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -7,7 +7,7 @@ # testsuite missing deps: hashable-time quickcheck-instances tasty-golden Name: ghc-%{pkg_name} -Version: 1.5.5.1 +Version: 1.5.6.0 Release: 1%{?dist} Summary: Fast JSON parsing and encoding @@ -15,6 +15,7 @@ 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: @@ -87,6 +88,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 @@ -124,6 +126,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 1.5.6.0-1 +- update to 1.5.6.0 + * Thu Aug 5 2021 Jens Petersen - 1.5.5.1-1 - update to 1.5.5.1 diff --git a/sources b/sources index b498eef..08d99ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-1.5.5.1.tar.gz) = 5bf3fed752dc601d9cc868d25d44898c8f5c2cc8ac5bc24b20ca2a56af66b776f02d2fc312c54d351931132d342b85215d2f5a211c87b77e043834a63ede6e0a +SHA512 (aeson-1.5.6.0.tar.gz) = 31e0339945aec6d84aec230c09001fe6e7926f008d3444d12264bb323d0a050515303fdc8eeb6563733594209d930cdd2f82eb4dfe4dd4d5c573748aaa71813d From 3fa1165a21171a6e88828ae9c25a98210a9ad453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:28:50 +0000 Subject: [PATCH 60/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index a196769..a176089 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast JSON parsing and encoding License: BSD @@ -126,6 +126,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.5.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 1.5.6.0-1 - update to 1.5.6.0 From 67532357da10d457bf1fa5d3e4a52ee49e0dab5b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 18 Jun 2022 00:21:40 +0800 Subject: [PATCH 61/62] revise .cabal --- aeson-1.5.6.0.cabal | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/aeson-1.5.6.0.cabal b/aeson-1.5.6.0.cabal index 60c665e..6840e64 100644 --- a/aeson-1.5.6.0.cabal +++ b/aeson-1.5.6.0.cabal @@ -1,6 +1,6 @@ name: aeson version: 1.5.6.0 -x-revision: 1 +x-revision: 5 license: BSD3 license-file: LICENSE category: Text, Web, JSON @@ -95,20 +95,20 @@ library -- GHC bundled libs build-depends: base >= 4.7.0.0 && < 5, - bytestring >= 0.10.4.0 && < 0.12, + bytestring >= 0.10.4.0 && < 0.11.2, containers >= 0.5.5.1 && < 0.7, deepseq >= 1.3.0.0 && < 1.5, ghc-prim >= 0.2 && < 0.8, template-haskell >= 2.9.0.0 && < 2.18, text >= 1.2.3.0 && < 1.3, - time >= 1.4 && < 1.12 + time >= 1.4 && < 1.13 if impl(ghc >= 8.0) build-depends: bytestring >= 0.10.8.1 -- Compat build-depends: - base-compat-batteries >= 0.10.0 && < 0.12, + base-compat-batteries >= 0.10.0 && < 0.13, time-compat >= 1.9.4 && < 1.10 if !impl(ghc >= 8.6) @@ -118,9 +118,9 @@ library if !impl(ghc >= 8.0) -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9 build-depends: - semigroups >= 0.18.5 && < 0.20, - transformers >= 0.3.0.0 && < 0.6, - transformers-compat >= 0.6.2 && < 0.7, + semigroups >= 0.18.5 && < 0.21, + transformers >= 0.3.0.0 && < 0.7, + transformers-compat >= 0.6.2 && < 0.8, fail == 4.9.* if !impl(ghc >= 7.10) From ad1d407361442b74d69ac6f32b08c367ad47a9c6 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:17:17 +0300 Subject: [PATCH 62/62] 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 08d99ad..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (aeson-1.5.6.0.tar.gz) = 31e0339945aec6d84aec230c09001fe6e7926f008d3444d12264bb323d0a050515303fdc8eeb6563733594209d930cdd2f82eb4dfe4dd4d5c573748aaa71813d