From 0c13215f51dfca644332eb5d487aafdca77a21b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 28 Mar 2014 12:46:58 +0000 Subject: [PATCH 01/44] 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 30a140f24c467ee9d0274390dc9e37f69698f81c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 30 Mar 2014 13:59:01 +0900 Subject: [PATCH 02/44] import (#1058174) --- .gitignore | 1 + ghc-aeson-pretty.spec | 88 +++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 90 insertions(+) create mode 100644 ghc-aeson-pretty.spec diff --git a/.gitignore b/.gitignore index e69de29..aa8275c 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/aeson-pretty-0.7.1.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec new file mode 100644 index 0000000..eec9ee3 --- /dev/null +++ b/ghc-aeson-pretty.spec @@ -0,0 +1,88 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name aeson-pretty + +Name: ghc-%{pkg_name} +Version: 0.7.1 +Release: 1%{?dist} +Summary: JSON pretty-printing library + +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 + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: chrpath +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmdargs-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel +# End cabal-rpm deps + +%description +A JSON pretty-printing library compatible with aeson as well as a command-line +tool to improve readabilty of streams of JSON data. + +The library provides the function "encodePretty". It is a drop-in replacement +for aeson's "encode" function, producing JSON-ByteStrings for human readers. + +The command-line tool reads JSON from stdin and writes prettified JSON to +stdout. It also offers a complementary "compact"-mode, essentially the opposite +of pretty-printing. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + +%ghc_fix_dynamic_rpath %{pkg_name} + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files +%doc README.markdown +%{_bindir}/aeson-pretty + + +%changelog +* Mon Jan 27 2014 Jens Petersen - 0.7.1-1 +- package the tool in devel subpackage +- simpler summary and description + +* Mon Jan 27 2014 Fedora Haskell SIG - 0.7.1 +- spec file generated by cabal-rpm-0.8.8 diff --git a/sources b/sources index e69de29..59ec5c1 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +557a22907c3454f974add938241a9339 aeson-pretty-0.7.1.tar.gz From 9d20ae99fcebbcf4227b37466fb950ec5c073a52 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:25:48 -0500 Subject: [PATCH 03/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index eec9ee3..e9d7a6e 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON pretty-printing library License: BSD @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Jan 27 2014 Jens Petersen - 0.7.1-1 - package the tool in devel subpackage - simpler summary and description From e2be0fa07967315b591227df9d4dbbfd266a0c76 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 14:37:09 +0000 Subject: [PATCH 04/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index e9d7a6e..8a981b5 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON pretty-printing library License: BSD @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 3f55f0a6225cf9ba8a069da9d22086c0d3871fcd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Jan 2015 15:59:42 +0900 Subject: [PATCH 05/44] update urls --- ghc-aeson-pretty.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 8a981b5..3f8488f 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,12 +4,12 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JSON pretty-printing library 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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -76,10 +76,13 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %doc README.markdown -%{_bindir}/aeson-pretty +%{_bindir}/%{pkg_name} %changelog +* Wed Jan 28 2015 Jens Petersen - 0.7.1-4 +- update urls + * Sat Aug 16 2014 Fedora Release Engineering - 0.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From a9c94cbf9b45e400cd1115dd23c4ad7eeb61d83e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 07:30:37 +0000 Subject: [PATCH 06/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 3f8488f..f1abd01 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JSON pretty-printing library License: BSD @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jan 28 2015 Jens Petersen - 0.7.1-4 - update urls From 5001cab0cbab990a51322f5a5a36b53bb23c3fb9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:24:36 +0000 Subject: [PATCH 07/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index f1abd01..99d7f2d 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JSON pretty-printing library License: BSD @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.7.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.7.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d020132e8597f1bceaba8b617977564715a3896d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 26 Apr 2016 16:52:31 -0400 Subject: [PATCH 08/44] Rebuild for updated ghc(cmdargs) --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 99d7f2d..e0f0305 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JSON pretty-printing library License: BSD @@ -80,6 +80,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Apr 26 2016 Zbigniew Jędrzejewski-Szmek - 0.7.1-7 +- Rebuild for ghc(cmdargs) + * Wed Feb 03 2016 Fedora Release Engineering - 0.7.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 7d97ae8e1088e18db34d0ff14967d3819dae8909 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 23 Jun 2016 11:53:51 +0900 Subject: [PATCH 09/44] update to 0.7.2 --- .gitignore | 1 + ghc-aeson-pretty.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aa8275c..642790e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aeson-pretty-0.7.1.tar.gz +/aeson-pretty-0.7.2.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index e0f0305..0829e79 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -3,8 +3,8 @@ %global pkg_name aeson-pretty Name: ghc-%{pkg_name} -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: JSON pretty-printing library License: BSD @@ -61,6 +61,8 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_fix_dynamic_rpath %{pkg_name} +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -71,7 +73,7 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files @@ -80,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jun 23 2016 Jens Petersen - 0.7.2-1 +- update to 0.7.2 + * Tue Apr 26 2016 Zbigniew Jędrzejewski-Szmek - 0.7.1-7 - Rebuild for ghc(cmdargs) diff --git a/sources b/sources index 59ec5c1..1407010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -557a22907c3454f974add938241a9339 aeson-pretty-0.7.1.tar.gz +6d897fa4d95b6752668fd5ff9f697244 aeson-pretty-0.7.2.tar.gz From b98029196574d328b1d47792c40ce1e7225ea18f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:26 +0900 Subject: [PATCH 10/44] no longer remove license --- ghc-aeson-pretty.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 0829e79..aed9e93 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -61,8 +61,6 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_fix_dynamic_rpath %{pkg_name} -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache From 450f4f65ea1f909473533ce54b07ec0b4781a4af Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 5 Oct 2016 13:11:32 +0900 Subject: [PATCH 11/44] update to 0.8.2 --- .gitignore | 1 + ghc-aeson-pretty.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 642790e..10aeef0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /aeson-pretty-0.7.1.tar.gz /aeson-pretty-0.7.2.tar.gz +/aeson-pretty-0.8.2.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index aed9e93..4ea449d 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -3,7 +3,7 @@ %global pkg_name aeson-pretty Name: ghc-%{pkg_name} -Version: 0.7.2 +Version: 0.8.2 Release: 1%{?dist} Summary: JSON pretty-printing library @@ -17,8 +17,10 @@ BuildRequires: ghc-rpm-macros BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cmdargs-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel @@ -80,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Oct 05 2016 Jens Petersen - 0.8.2-1 +- update to 0.8.2 + * Thu Jun 23 2016 Jens Petersen - 0.7.2-1 - update to 0.7.2 diff --git a/sources b/sources index 1407010..884d622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d897fa4d95b6752668fd5ff9f697244 aeson-pretty-0.7.2.tar.gz +3819838fe8fb604e1cf5cc11eb2037b5 aeson-pretty-0.8.2.tar.gz From 6d5050f83174f5d4c19956b50205e7f8ed20f779 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:32:41 +0000 Subject: [PATCH 12/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 4ea449d..d1fde44 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON pretty-printing library License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Oct 05 2016 Jens Petersen - 0.8.2-1 - update to 0.8.2 From aa290ae45f6eadbdaa3820fee950424daed64b1b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Feb 2017 17:48:08 +0900 Subject: [PATCH 13/44] refresh to cabal-rpm-0.11.1 --- ghc-aeson-pretty.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index d1fde44..809d541 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,15 +1,17 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson-pretty +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON pretty-printing library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -51,7 +53,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -60,8 +62,7 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install - -%ghc_fix_dynamic_rpath %{pkg_name} +%ghc_fix_rpath %{pkgver} %post devel @@ -82,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 24 2017 Jens Petersen - 0.8.2-3 +- refresh to cabal-rpm-0.11.1 + * Fri Feb 10 2017 Fedora Release Engineering - 0.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 521409e125d7c352025008998e6fd6778c350530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 09:33:51 +0000 Subject: [PATCH 14/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 809d541..32e9ffa 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JSON pretty-printing library License: BSD @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 24 2017 Jens Petersen - 0.8.2-3 - refresh to cabal-rpm-0.11.1 From 8c2a1209fe71f168c0fffdece130e422aaf3f4d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:12:04 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 32e9ffa..ed0c842 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JSON pretty-printing library License: BSD @@ -83,6 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 313bf4a39614fdfb6b06dadc334712b0baf2f55c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:31 +0100 Subject: [PATCH 16/44] refresh to cabal-rpm-0.12.1 --- ghc-aeson-pretty.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index ed0c842..e10c966 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson-pretty @@ -43,9 +43,12 @@ of pretty-printing. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -65,6 +68,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_fix_rpath %{pkgver} +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From becd3d98cdbdfc5434ba7ae1d42d106392bf4908 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:19:18 +0100 Subject: [PATCH 17/44] update to 0.8.5 --- .gitignore | 1 + ghc-aeson-pretty.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10aeef0..699c363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /aeson-pretty-0.7.1.tar.gz /aeson-pretty-0.7.2.tar.gz /aeson-pretty-0.8.2.tar.gz +/aeson-pretty-0.8.5.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index e10c966..80802ec 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Summary: JSON pretty-printing library License: BSD @@ -92,6 +92,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 0.8.5-1 +- update to 0.8.5 + * Wed Aug 02 2017 Fedora Release Engineering - 0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 884d622..6220ed5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3819838fe8fb604e1cf5cc11eb2037b5 aeson-pretty-0.8.2.tar.gz +SHA512 (aeson-pretty-0.8.5.tar.gz) = b429dad73923f6a7a5892b511af19b766d639c21bab8a2b8d1750a1f972c4f55c5139f37773474d303597cd4d02f168515be7b537f33ea62987e77fd3d701e8a From 13885f48e4249b7450f52b138fed7b724528b747 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:01:53 +0900 Subject: [PATCH 18/44] drop ldconfig scriptlets --- ghc-aeson-pretty.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 80802ec..e2cfae0 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -68,12 +68,6 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_fix_rpath %{pkgver} -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From e2d8ea9b3e7110fe04b2b28041c73d0f386396ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:16:53 +0000 Subject: [PATCH 19/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index e2cfae0..b524f66 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON pretty-printing library License: BSD @@ -86,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.8.5-1 - update to 0.8.5 From 1ee8609a67d46b10439a8a002aa8950bb0e17b73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:32:15 +0000 Subject: [PATCH 20/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index b524f66..05f14d4 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON pretty-printing library License: BSD @@ -86,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9d8765309058dbf35f2b8b5a2396b152294980f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:31 +0200 Subject: [PATCH 21/44] Rebuilt for #1607054 --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 05f14d4..6bed600 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JSON pretty-printing library License: BSD @@ -86,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.8.5-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1cb739b468473a6f34628aa3db2dd4ca2fcaa4cf Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jul 2018 17:09:48 -0700 Subject: [PATCH 22/44] Disable annotated build to work around #1607054 --- ghc-aeson-pretty.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 6bed600..c83aea6 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,6 +1,9 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell +# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 +%undefine _annotated_build + %global pkg_name aeson-pretty %global pkgver %{pkg_name}-%{version} From 5bef99f163bf091709e590150877977bc1958855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Jul 2018 12:50:34 +0200 Subject: [PATCH 23/44] Enable annotated build again This reverts commit 1cb739b468473a6f34628aa3db2dd4ca2fcaa4cf. --- ghc-aeson-pretty.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index c83aea6..9762c25 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,15 +1,12 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell -# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1607054 -%undefine _annotated_build - %global pkg_name aeson-pretty %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} Version: 0.8.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JSON pretty-printing library License: BSD @@ -89,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Jul 24 2018 Miro Hrončok - 0.8.5-5 +- Enable annotated build again + * Mon Jul 23 2018 Miro Hrončok - 0.8.5-4 - Rebuilt for #1607054 From 478da271721ae800ca583e333f86458d1bdff8c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:06:04 +0900 Subject: [PATCH 24/44] update to 0.8.7 --- .gitignore | 1 + ghc-aeson-pretty.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 699c363..26a34fa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aeson-pretty-0.7.2.tar.gz /aeson-pretty-0.8.2.tar.gz /aeson-pretty-0.8.5.tar.gz +/aeson-pretty-0.8.7.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 9762c25..1c8bf78 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,12 +1,12 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson-pretty %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.8.5 -Release: 5%{?dist} +Version: 0.8.7 +Release: 1%{?dist} Summary: JSON pretty-printing library License: BSD @@ -86,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 0.8.7-1 +- update to 0.8.7 + * Tue Jul 24 2018 Miro Hrončok - 0.8.5-5 - Enable annotated build again diff --git a/sources b/sources index 6220ed5..a1580a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-pretty-0.8.5.tar.gz) = b429dad73923f6a7a5892b511af19b766d639c21bab8a2b8d1750a1f972c4f55c5139f37773474d303597cd4d02f168515be7b537f33ea62987e77fd3d701e8a +SHA512 (aeson-pretty-0.8.7.tar.gz) = b23cd85703ed21060dac3d608b894f0c331f6a008f0edeab319b4bdad8e07ce74f13dbe1865caa0ac091f85523fe334ae33bf735337411a9e70d1031dd5d33be From 93cad37b46e35eeca5ea89b5650fc340cbeaf696 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:08:46 +0000 Subject: [PATCH 25/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 1c8bf78..e16a1c2 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON pretty-printing library License: BSD @@ -86,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.8.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.8.7-1 - update to 0.8.7 From 17e7df3535961f33c7c3b060cbfd87885dbaf5aa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:43:24 +0800 Subject: [PATCH 26/44] refresh to cabal-rpm-0.13 --- ghc-aeson-pretty.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index e16a1c2..f5d157d 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.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-pretty @@ -6,17 +6,18 @@ Name: ghc-%{pkg_name} Version: 0.8.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON pretty-printing library 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: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel @@ -56,16 +57,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 -%ghc_fix_rpath %{pkgver} +# End cabal-rpm install %post devel @@ -77,7 +83,9 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -86,6 +94,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.8.7-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.8.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0df88b744677cb847dcc0b989b3774ddddfdf1bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:04:47 +0000 Subject: [PATCH 27/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index f5d157d..3196735 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JSON pretty-printing library License: BSD @@ -94,6 +94,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.8.7-3 - refresh to cabal-rpm-0.13 From 155c07ddace1dcc7f0ddc671f4dffbabb3a58de3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:21:24 +0000 Subject: [PATCH 28/44] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-aeson-pretty.spec | 53 ++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 3196735..3af1b1a 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.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-pretty @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JSON pretty-printing library License: BSD @@ -17,6 +17,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-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -44,11 +50,8 @@ of pretty-printing. %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} @@ -56,6 +59,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -74,14 +96,6 @@ This package provides the Haskell %{pkg_name} library development files. # End cabal-rpm install -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -93,7 +107,20 @@ This package provides the Haskell %{pkg_name} library development files. %{_bindir}/%{pkg_name} +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Thu Aug 01 2019 Jens Petersen - 0.8.7-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.8.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e4b26d6a0387c83b5f8d7f7a57177229b051612d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:27:21 +0800 Subject: [PATCH 29/44] BR prof for lib and static for executable --- ghc-aeson-pretty.spec | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 3af1b1a..81a5e7d 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.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-pretty @@ -17,22 +17,17 @@ 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-aeson-devel -BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cmdargs-devel -BuildRequires: ghc-scientific-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-vector-devel +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cmdargs-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-vector-prof # End cabal-rpm deps %description @@ -50,6 +45,7 @@ of pretty-printing. %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 69ede98d1893683916ce0c3a56ba5509c4aba98d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:14:26 +0000 Subject: [PATCH 30/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 81a5e7d..8986dc9 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JSON pretty-printing library License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.8.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 0.8.7-5 - add doc and prof subpackages (cabal-rpm-1.0.0) From d9c109f6c3dbef64f89662e72587433f724355db Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:48:51 +0800 Subject: [PATCH 31/44] refresh to cabal-rpm-2.0.2 --- ghc-aeson-pretty.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 8986dc9..23f3144 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson-pretty @@ -58,6 +58,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. @@ -68,6 +69,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -92,6 +94,16 @@ This package provides the Haskell %{pkg_name} profiling library. # 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 @@ -105,6 +117,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From a1ab7abf2ff74eaa3f7770edcf367b3da978717a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 9 Feb 2020 21:51:19 +0800 Subject: [PATCH 32/44] update to 0.8.8 --- .gitignore | 1 + ghc-aeson-pretty.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26a34fa..fce8338 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /aeson-pretty-0.8.2.tar.gz /aeson-pretty-0.8.5.tar.gz /aeson-pretty-0.8.7.tar.gz +/aeson-pretty-0.8.8.tar.gz diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 23f3144..eef7508 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.8.7 -Release: 6%{?dist} +Version: 0.8.8 +Release: 1%{?dist} Summary: JSON pretty-printing library License: BSD @@ -127,6 +127,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Feb 09 2020 Jens Petersen - 0.8.8-1 +- update to 0.8.8 + * Tue Jan 28 2020 Fedora Release Engineering - 0.8.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index a1580a1..fe3ed5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-pretty-0.8.7.tar.gz) = b23cd85703ed21060dac3d608b894f0c331f6a008f0edeab319b4bdad8e07ce74f13dbe1865caa0ac091f85523fe334ae33bf735337411a9e70d1031dd5d33be +SHA512 (aeson-pretty-0.8.8.tar.gz) = 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779 From b624c55a21d12ff252e1e8d328b07c3f54a78cbf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:08 +0800 Subject: [PATCH 33/44] refresh to cabal-rpm-2.0.5 --- ghc-aeson-pretty.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index eef7508..acfd520 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.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-pretty %global pkgver %{pkg_name}-%{version} From 821064ec1888383b188481f32231f7c5cba2694b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:53:45 +0800 Subject: [PATCH 34/44] refresh to cabal-rpm-2.0.6 --- ghc-aeson-pretty.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index acfd520..27c4d9e 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name aeson-pretty @@ -94,16 +94,6 @@ This package provides the Haskell %{pkg_name} profiling library. # 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 cf4415d15e51d2a81af93403fd2dcd6fabc21cc4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 17:50:31 +0800 Subject: [PATCH 35/44] bump release --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 27c4d9e..bf0a9db 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON pretty-printing library License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 0.8.8-2 +- refresh to cabal-rpm-2.0.6 + * Sun Feb 09 2020 Jens Petersen - 0.8.8-1 - update to 0.8.8 From ad2d04d1b81daf5cc278aac31eb7e783e0a67af7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:46:14 +0000 Subject: [PATCH 36/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index bf0a9db..2c99f88 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JSON pretty-printing library License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.8.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.8.8-2 - refresh to cabal-rpm-2.0.6 From f9087a4b3e583a92c669c108dac209f14348297e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:50:21 +0000 Subject: [PATCH 37/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 2c99f88..1641774 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JSON pretty-printing library License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.8.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.8.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 43b038610b5ab625630ced89d47cfdd3d8d09ad3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:16:58 +0000 Subject: [PATCH 38/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 1641774..b4501f0 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JSON pretty-printing library License: BSD @@ -117,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.8.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.8.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 22b63ebd6394775c1ee49ec8e4f0d75114c4d568 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:09 +0800 Subject: [PATCH 39/44] refresh to cabal-rpm-2.0.9 --- ghc-aeson-pretty.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index b4501f0..c0aa13b 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.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-pretty @@ -59,6 +59,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 532aae09f9c70d4ec8adca04de3cc38391a3804b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 10:19:42 +0800 Subject: [PATCH 40/44] bump release --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index c0aa13b..920ae32 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JSON pretty-printing library License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Aug 06 2021 Jens Petersen - 0.8.8-6 +- rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1925f2fe0a6311c1f91d8025b251dd42a87d0bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:11:18 +0100 Subject: [PATCH 41/44] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 920ae32..391bf2f 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JSON pretty-printing library License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Jan 08 2022 Miro Hrončok - 0.8.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Fri Aug 06 2021 Jens Petersen - 0.8.8-6 - rebuild From 51fd9def8148e1b790b5a1ffcf2ebec683b0aebc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:29:17 +0000 Subject: [PATCH 42/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-aeson-pretty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 391bf2f..7b8c9ca 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JSON pretty-printing library License: BSD @@ -118,6 +118,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.8.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Miro Hrončok - 0.8.8-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 From 1bed890d483c5c6594635a541b96706f76135f6b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 10:23:05 +0800 Subject: [PATCH 43/44] update to 0.8.9 --- .gitignore | 1 + aeson-pretty-0.8.9.cabal | 83 ++++++++++++++++++++++++++++++++++++++++ ghc-aeson-pretty.spec | 12 ++++-- sources | 2 +- 4 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 aeson-pretty-0.8.9.cabal diff --git a/.gitignore b/.gitignore index fce8338..bdda390 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /aeson-pretty-0.8.5.tar.gz /aeson-pretty-0.8.7.tar.gz /aeson-pretty-0.8.8.tar.gz +/aeson-pretty-0.8.9.tar.gz diff --git a/aeson-pretty-0.8.9.cabal b/aeson-pretty-0.8.9.cabal new file mode 100644 index 0000000..396709a --- /dev/null +++ b/aeson-pretty-0.8.9.cabal @@ -0,0 +1,83 @@ +cabal-version: 2.0 +name: aeson-pretty +version: 0.8.9 +x-revision: 1 +license: BSD3 +license-file: LICENSE +category: Text, Web, JSON, Pretty Printer +copyright: Copyright 2011 Falko Peters +author: Falko Peters +maintainer: Martijn Bastiaan +stability: experimental +homepage: http://github.com/informatikr/aeson-pretty +bug-reports: http://github.com/informatikr/aeson-pretty/issues +build-type: Simple +synopsis: JSON pretty-printing library and command-line tool. +description: + A JSON pretty-printing library compatible with aeson as well as + a command-line tool to improve readabilty of streams of JSON data. + . + The /library/ provides the function "encodePretty". It is a drop-in + replacement for aeson's "encode" function, producing JSON-ByteStrings for + human readers. + . + The /command-line tool/ reads JSON from stdin and writes prettified JSON + to stdout. It also offers a complementary "compact"-mode, essentially the + opposite of pretty-printing. If you specify @-flib-only@ like this + . + > cabal install -flib-only aeson-pretty + . + the command-line tool will NOT be installed. + +extra-source-files: + README.markdown + CHANGELOG.markdown + +flag lib-only + description: Only build/install the library, NOT the command-line tool. + default: False + +library + exposed-modules: + Data.Aeson.Encode.Pretty + + build-depends: + aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0, + base >= 4.5, + base-compat >= 0.9, + bytestring >= 0.9, + scientific >= 0.3, + vector >= 0.9, + text >= 0.11, + unordered-containers >= 0.2.14.0 + + if !impl(ghc >= 8.0) + build-depends: + semigroups >= 0.18.2 + + ghc-options: -Wall + default-language: Haskell2010 + +executable aeson-pretty + hs-source-dirs: cli-tool + main-is: Main.hs + other-modules: Paths_aeson_pretty + autogen-modules: Paths_aeson_pretty + + if flag(lib-only) + buildable: False + else + build-depends: + aeson >= 0.6, + aeson-pretty, + attoparsec >= 0.10, + base == 4.*, + bytestring >= 0.9, + cmdargs >= 0.7 + + ghc-options: -Wall + default-language: Haskell2010 + +source-repository head + type: git + location: http://github.com/informatikr/aeson-pretty diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 7b8c9ca..1f4c009 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -5,17 +5,19 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.8.8 -Release: 8%{?dist} +Version: 0.8.9 +Release: 1%{?dist} Summary: JSON pretty-printing library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-aeson-prof @@ -80,6 +82,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -102,7 +105,7 @@ This package provides the Haskell %{pkg_name} profiling library. %files devel -f %{name}-devel.files -%doc README.markdown +%doc CHANGELOG.markdown README.markdown %{_bindir}/%{pkg_name} @@ -118,6 +121,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 0.8.9-1 +- https://hackage.haskell.org/package/aeson-pretty-0.8.9/changelog + * Thu Jan 20 2022 Fedora Release Engineering - 0.8.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index fe3ed5d..aafca76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aeson-pretty-0.8.8.tar.gz) = 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779 +SHA512 (aeson-pretty-0.8.9.tar.gz) = 00c99799cbe9e268109116f909ea0d9ef2708e578ec363ba5455b43d76d1f89bc9820dcbd3a63a1fb300460d97a71105f028f4ad9853b56ce16a097826b1d3d5 From 4be85bf118db2e45ffb142003231395e05bdef66 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:17:45 +0300 Subject: [PATCH 44/44] 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 aafca76..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (aeson-pretty-0.8.9.tar.gz) = 00c99799cbe9e268109116f909ea0d9ef2708e578ec363ba5455b43d76d1f89bc9820dcbd3a63a1fb300460d97a71105f028f4ad9853b56ce16a097826b1d3d5