From 5e2da3d0c51650e6ff86053d405087978431fc8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 18 Nov 2013 13:03:44 +0000 Subject: [PATCH 01/66] 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 09cd17e13dd59d924afcccc2fe813c6e599680ec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 Nov 2013 18:31:05 +0900 Subject: [PATCH 02/66] import (#1008787) --- .gitignore | 1 + ghc-yaml.spec | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 103 insertions(+) create mode 100644 ghc-yaml.spec diff --git a/.gitignore b/.gitignore index e69de29..8b7776f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/yaml-0.8.5.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec new file mode 100644 index 0000000..097742f --- /dev/null +++ b/ghc-yaml.spec @@ -0,0 +1,101 @@ +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name yaml + +Name: ghc-%{pkg_name} +Version: 0.8.5 +Release: 2%{?dist} +Summary: Support for parsing and rendering YAML documents + +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-conduit-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unordered-containers-devel +BuildRequires: ghc-vector-devel +BuildRequires: pkgconfig(yaml-0.1) +# End cabal-rpm deps +# conduit not available +ExcludeArch: armv7hl + +%description +Provides support for parsing and emitting Yaml documents. + +The package is broken down into two modules. "Data.Yaml" provides a high-level +interface based around the JSON datatypes provided by the aeson package. +"Text.Libyaml" provides a lower-level, streaming interface. For most users, +"Data.Yaml" is recommended. + + +%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} +# Begin cabal-rpm deps: +Requires: pkgconfig(yaml-0.1) +# End cabal-rpm deps + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkg_name}-%{version} + +cabal-tweak-flag system-libyaml True +# remove the bundled lib +rm -r libyaml + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + +%ghc_fix_dynamic_rpath %{name} + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files +%{_bindir}/yaml2json + + +%changelog +* Wed Oct 16 2013 Jens Petersen - 0.8.5-2 +- add static provides and pkgconfig requires to devel + +* Tue Sep 17 2013 Jens Petersen - 0.8.5-1 +- build with system libyaml +- package yaml2json in devel subpackage +- exclude armv7hl because of conduit + +* Tue Sep 17 2013 Fedora Haskell SIG - 0.8.5-0 +- spec file generated by cabal-rpm-0.8.3 diff --git a/sources b/sources index e69de29..ab75d56 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f63d6b2c0cc080958c993f795dd7be02 yaml-0.8.5.tar.gz From 0e22658b1d8814eff5ce52e48dc02a0553537b2c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 19 Nov 2013 18:38:22 +0900 Subject: [PATCH 03/66] run chrpath on yaml2json (#1008787) --- ghc-yaml.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 097742f..993684f 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -69,7 +69,7 @@ rm -r libyaml %install %ghc_lib_install -%ghc_fix_dynamic_rpath %{name} +%ghc_fix_dynamic_rpath yaml2json %post devel @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Tue Nov 19 2013 Jens Petersen - 0.8.5-3 +- run chrpath on yaml2json (#1008787) + * Wed Oct 16 2013 Jens Petersen - 0.8.5-2 - add static provides and pkgconfig requires to devel From 35d0f1e6546e61fc12b738190c41e999a807e75d Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 5 Dec 2013 03:26:50 -0500 Subject: [PATCH 04/66] Latest upstream --- .gitignore | 1 + ghc-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b7776f..6e9f7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /yaml-0.8.5.tar.gz +/yaml-0.8.5.2.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 993684f..6a32f74 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -3,8 +3,8 @@ %global pkg_name yaml Name: ghc-%{pkg_name} -Version: 0.8.5 -Release: 3%{?dist} +Version: 0.8.5.2 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Thu Dec 5 2013 Ricky Elrod - 0.8.5.2-1 +- Latest upstream version. + * Tue Nov 19 2013 Jens Petersen - 0.8.5-3 - run chrpath on yaml2json (#1008787) diff --git a/sources b/sources index ab75d56..dca84e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f63d6b2c0cc080958c993f795dd7be02 yaml-0.8.5.tar.gz +9b4757fd010d6ae2d2ba27275a3a619e yaml-0.8.5.2.tar.gz From 42e6f5eb6abf03aaecfdc7e6fdb649a23ca099b4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jan 2014 19:08:25 +0900 Subject: [PATCH 05/66] update to 0.8.5.3 --- .gitignore | 1 + ghc-yaml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6e9f7cf..30044c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /yaml-0.8.5.tar.gz /yaml-0.8.5.2.tar.gz +/yaml-0.8.5.3.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 6a32f74..58f95ad 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -3,7 +3,7 @@ %global pkg_name yaml Name: ghc-%{pkg_name} -Version: 0.8.5.2 +Version: 0.8.5.3 Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Wed Jan 22 2014 Jens Petersen - 0.8.5.3-1 +- update to 0.8.5.3 + * Thu Dec 5 2013 Ricky Elrod - 0.8.5.2-1 - Latest upstream version. diff --git a/sources b/sources index dca84e9..38da0b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b4757fd010d6ae2d2ba27275a3a619e yaml-0.8.5.2.tar.gz +48913fedf6db43cb60963e5d116ad398 yaml-0.8.5.3.tar.gz From 8aa71952609f180874da68832adf41b486bdfe53 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 2 May 2014 12:49:32 +0900 Subject: [PATCH 06/66] update to 0.8.8.2 - no longer exclude arm --- .gitignore | 1 + ghc-yaml.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 30044c6..554208a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /yaml-0.8.5.tar.gz /yaml-0.8.5.2.tar.gz /yaml-0.8.5.3.tar.gz +/yaml-0.8.8.2.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 58f95ad..998afa6 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -3,13 +3,13 @@ %global pkg_name yaml Name: ghc-%{pkg_name} -Version: 0.8.5.3 +Version: 0.8.8.2 Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents 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 +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -21,14 +21,13 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: pkgconfig(yaml-0.1) # End cabal-rpm deps -# conduit not available -ExcludeArch: armv7hl %description Provides support for parsing and emitting Yaml documents. @@ -89,6 +88,10 @@ rm -r libyaml %changelog +* Fri May 02 2014 Jens Petersen - 0.8.8.2-1 +- update to 0.8.8.2 +- no longer exclude arm + * Wed Jan 22 2014 Jens Petersen - 0.8.5.3-1 - update to 0.8.5.3 diff --git a/sources b/sources index 38da0b8..db3c6ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -48913fedf6db43cb60963e5d116ad398 yaml-0.8.5.3.tar.gz +90f36a9e4ea623c32a82e22089e2a0d1 yaml-0.8.8.2.tar.gz From 083ab463c1eccca539773accefdd80240cdb2773 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 May 2014 11:35:33 +0900 Subject: [PATCH 07/66] add json2yaml --- ghc-yaml.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 998afa6..9dab1ce 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -85,6 +85,7 @@ rm -r libyaml %files devel -f %{name}-devel.files %{_bindir}/yaml2json +%{_bindir}/json2yaml %changelog From eefe5a086a5a71b2775a0edd41a858a7f9c5b96e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 26 May 2014 11:46:17 -0700 Subject: [PATCH 08/66] rebuild for new ghc-scientific --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 9dab1ce..bac1d3a 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Mon May 26 2014 Adam Williamson - 0.8.8.2-2 +- rebuild for new ghc-scientific + * Fri May 02 2014 Jens Petersen - 0.8.8.2-1 - update to 0.8.8.2 - no longer exclude arm From cf2825116df85c20ba20b884976a3a75d4f1e5ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:31:22 -0500 Subject: [PATCH 09/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index bac1d3a..e8cfb98 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.8.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 26 2014 Adam Williamson - 0.8.8.2-2 - rebuild for new ghc-scientific From 44144aefdf4c553e7e35979e0e3e48c8887ab339 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:13:54 +0000 Subject: [PATCH 10/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index e8cfb98..955c41e 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.8.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -89,6 +89,9 @@ rm -r libyaml %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.8.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.8.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 2aceaad9819ae1727ebd1111d7dbb6e78079332c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 28 Jan 2015 15:09:44 +0900 Subject: [PATCH 11/66] cblrpm refresh --- ghc-yaml.spec | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 955c41e..af3de48 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -2,14 +2,16 @@ %global pkg_name yaml +%bcond_with tests + Name: ghc-%{pkg_name} Version: 0.8.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{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 @@ -27,13 +29,18 @@ BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: pkgconfig(yaml-0.1) +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-hspec-devel +%endif # End cabal-rpm deps %description Provides support for parsing and emitting Yaml documents. The package is broken down into two modules. "Data.Yaml" provides a high-level -interface based around the JSON datatypes provided by the aeson package. +interface based around the JSON datatypes provided by the 'aeson' package. "Text.Libyaml" provides a lower-level, streaming interface. For most users, "Data.Yaml" is recommended. @@ -68,7 +75,13 @@ rm -r libyaml %install %ghc_lib_install -%ghc_fix_dynamic_rpath yaml2json +%ghc_fix_dynamic_rpath json2yaml yaml2json + + +%check +%if %{with tests} +%cabal test +%endif %post devel @@ -84,11 +97,14 @@ rm -r libyaml %files devel -f %{name}-devel.files -%{_bindir}/yaml2json %{_bindir}/json2yaml +%{_bindir}/yaml2json %changelog +* Wed Jan 28 2015 Jens Petersen - 0.8.8.2-5 +- cblrpm refresh + * Sat Aug 16 2014 Fedora Release Engineering - 0.8.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 49fff8da1a98eb53b7c0d5221a5335043ec4acb4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Mar 2015 01:02:03 +0900 Subject: [PATCH 12/66] update to 0.8.10 --- .gitignore | 1 + ghc-yaml.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 554208a..78570bc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /yaml-0.8.5.2.tar.gz /yaml-0.8.5.3.tar.gz /yaml-0.8.8.2.tar.gz +/yaml-0.8.10.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index af3de48..902d209 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -5,8 +5,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.8.2 -Release: 5%{?dist} +Version: 0.8.10 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -22,6 +22,8 @@ BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel @@ -31,7 +33,7 @@ BuildRequires: ghc-vector-devel BuildRequires: pkgconfig(yaml-0.1) %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-directory-devel +BuildRequires: ghc-aeson-qq-devel BuildRequires: ghc-hspec-devel %endif # End cabal-rpm deps @@ -97,11 +99,15 @@ rm -r libyaml %files devel -f %{name}-devel.files +%doc README.md %{_bindir}/json2yaml %{_bindir}/yaml2json %changelog +* Wed Mar 4 2015 Jens Petersen - 0.8.10-1 +- update to 0.8.10 + * Wed Jan 28 2015 Jens Petersen - 0.8.8.2-5 - cblrpm refresh diff --git a/sources b/sources index db3c6ee..0521bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90f36a9e4ea623c32a82e22089e2a0d1 yaml-0.8.8.2.tar.gz +774f07d91a66113ebd003cb4ba683a89 yaml-0.8.10.tar.gz From 1e071daaa1878c38bd8835edb164bb91afe992d2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:07:28 +0000 Subject: [PATCH 13/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 902d209..eedbaf2 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -105,6 +105,9 @@ rm -r libyaml %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.8.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Mar 4 2015 Jens Petersen - 0.8.10-1 - update to 0.8.10 From b02e4dd803b6260f853a90be73791c6e01896399 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 31 Aug 2015 22:31:16 +0100 Subject: [PATCH 14/66] Rebuild (aarch64 vector hashes) --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index eedbaf2..d95e258 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -105,6 +105,9 @@ rm -r libyaml %changelog +* Mon Aug 31 2015 Peter Robinson 0.8.10-3 +- Rebuild (aarch64 vector hashes) + * Wed Jun 17 2015 Fedora Release Engineering - 0.8.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 35bc690e010af0e40dbe907c52de2d5cf26ee297 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:50:02 +0000 Subject: [PATCH 15/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index d95e258..be43fd9 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.8.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -105,6 +105,9 @@ rm -r libyaml %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.8.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Aug 31 2015 Peter Robinson 0.8.10-3 - Rebuild (aarch64 vector hashes) From ad78c0b97026db2c5ba8491a036dbe351af0b943 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 31 Aug 2016 14:22:46 +0900 Subject: [PATCH 16/66] update to 0.8.18.1 --- .gitignore | 1 + ghc-yaml.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 78570bc..0a8b4b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /yaml-0.8.5.3.tar.gz /yaml-0.8.8.2.tar.gz /yaml-0.8.10.tar.gz +/yaml-0.8.18.1.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index be43fd9..1805773 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -5,8 +5,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.10 -Release: 4%{?dist} +Version: 0.8.18.1 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -23,9 +23,11 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel +BuildRequires: ghc-enclosed-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel +BuildRequires: ghc-semigroups-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel @@ -34,7 +36,9 @@ BuildRequires: pkgconfig(yaml-0.1) %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-aeson-qq-devel +BuildRequires: ghc-base-compat-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-mockery-devel %endif # End cabal-rpm deps @@ -105,6 +109,9 @@ rm -r libyaml %changelog +* Wed Aug 31 2016 Jens Petersen - 0.8.18.1-1 +- update to 0.8.18.1 + * Wed Feb 03 2016 Fedora Release Engineering - 0.8.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 0521bb8..1d97725 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -774f07d91a66113ebd003cb4ba683a89 yaml-0.8.10.tar.gz +3f19c449c65c35d8c3785e11e61e611e yaml-0.8.18.1.tar.gz From c94734a61e7455c949466339bd670d8eb80c0a2c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Sep 2016 15:11:55 +0900 Subject: [PATCH 17/66] subpackage enclosed-exceptions dep --- .gitignore | 1 + ghc-yaml.spec | 30 ++++++++++++++++++++---------- sources | 1 + 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 0a8b4b2..d2bf0a4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /yaml-0.8.8.2.tar.gz /yaml-0.8.10.tar.gz /yaml-0.8.18.1.tar.gz +/enclosed-exceptions-1.0.2.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 1805773..e70fa9b 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,6 +1,8 @@ +# generated by cabal-rpm-0.10.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml +%global subpkgver enclosed-exceptions-1.0.2 %bcond_with tests @@ -12,6 +14,7 @@ Summary: Support for parsing and rendering YAML documents License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -23,7 +26,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-enclosed-exceptions-devel +#BuildRequires: ghc-enclosed-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel @@ -66,28 +69,35 @@ Requires: pkgconfig(yaml-0.1) This package provides the Haskell %{pkg_name} library development files. -%prep -%setup -q -n %{pkg_name}-%{version} +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{subpkgver} +%endif + +%global version %{main_version} + +%prep +%setup -q -c -n %{pkg_name}-%{version} -a1 +cd %{pkg_name}-%{version} cabal-tweak-flag system-libyaml True # remove the bundled lib rm -r libyaml %build -%ghc_lib_build +%ghc_libs_build %{subpkgver} %{pkg_name}-%{version} %install -%ghc_lib_install +%ghc_libs_install time-locale-compat-%{time_locale_compat_version} %{pkg_name}-%{version} %ghc_fix_dynamic_rpath json2yaml yaml2json %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel @@ -99,11 +109,10 @@ rm -r libyaml %files -f %{name}.files -%doc LICENSE %files devel -f %{name}-devel.files -%doc README.md +%doc ChangeLog.md README.md examples %{_bindir}/json2yaml %{_bindir}/yaml2json @@ -111,6 +120,7 @@ rm -r libyaml %changelog * Wed Aug 31 2016 Jens Petersen - 0.8.18.1-1 - update to 0.8.18.1 +- subpackage enclosed-exceptions dep * Wed Feb 03 2016 Fedora Release Engineering - 0.8.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 1d97725..9309ee0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +2bcd17eba9cb1ebcb8da5fbccfbc6101 enclosed-exceptions-1.0.2.tar.gz 3f19c449c65c35d8c3785e11e61e611e yaml-0.8.18.1.tar.gz From f428f6644bc45e0c871123d2f7a0599201791ce3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Sep 2016 15:14:46 +0900 Subject: [PATCH 18/66] missing %subpkgver --- ghc-yaml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index e70fa9b..45066cf 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -91,7 +91,7 @@ rm -r libyaml %install -%ghc_libs_install time-locale-compat-%{time_locale_compat_version} %{pkg_name}-%{version} +%ghc_libs_install %{subpkgver} %{pkg_name}-%{version} %ghc_fix_dynamic_rpath json2yaml yaml2json From 1fc5006a9185fa0c7dbd9469458208040e80657e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Sep 2016 15:18:24 +0900 Subject: [PATCH 19/66] introduce %pkgver and tweak %doc paths --- ghc-yaml.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 45066cf..def778b 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -2,6 +2,7 @@ # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml +%global pkgver %{pkg_name}-%{version} %global subpkgver enclosed-exceptions-1.0.2 %bcond_with tests @@ -13,7 +14,7 @@ Summary: Support for parsing and rendering YAML documents 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: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel @@ -79,19 +80,19 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -c -n %{pkg_name}-%{version} -a1 -cd %{pkg_name}-%{version} +%setup -q -c -n %{pkgver} -a1 +cd %{pkgver} cabal-tweak-flag system-libyaml True # remove the bundled lib rm -r libyaml %build -%ghc_libs_build %{subpkgver} %{pkg_name}-%{version} +%ghc_libs_build %{subpkgver} %{pkgver} %install -%ghc_libs_install %{subpkgver} %{pkg_name}-%{version} +%ghc_libs_install %{subpkgver} %{pkgver} %ghc_fix_dynamic_rpath json2yaml yaml2json @@ -112,7 +113,7 @@ rm -r libyaml %files devel -f %{name}-devel.files -%doc ChangeLog.md README.md examples +%doc %{pkgver}/ChangeLog.md %{pkgver}/README.md %{pkgver}/examples %{_bindir}/json2yaml %{_bindir}/yaml2json From 8864d3074530151d684dca07dac89a007c3f1c6f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Sep 2016 16:28:15 +0900 Subject: [PATCH 20/66] use ghc-rpm-macros-extra for subpackaging --- ghc-yaml.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index def778b..448606f 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -18,7 +18,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-aeson-devel From 948d9e394e2702996273c42f2c51933799e024cc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Sep 2016 13:24:28 +0900 Subject: [PATCH 21/66] add RR link for enclosed-exceptions --- ghc-yaml.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 448606f..6279078 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -3,6 +3,7 @@ %global pkg_name yaml %global pkgver %{pkg_name}-%{version} +# https://bugzilla.redhat.com/show_bug.cgi?id=1374137 %global subpkgver enclosed-exceptions-1.0.2 %bcond_with tests @@ -18,7 +19,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros-extra >= 1.6.7 # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-aeson-devel @@ -98,6 +99,7 @@ rm -r libyaml %check +cd %{pkg_name}-%{version} %cabal_test From 2aec2346287ebb20173c5d45ff3db25d21e77902 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 16:42:29 +0900 Subject: [PATCH 22/66] update to 0.8.18.7 build with latest macros --- .gitignore | 1 + ghc-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d2bf0a4..24126fd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /yaml-0.8.10.tar.gz /yaml-0.8.18.1.tar.gz /enclosed-exceptions-1.0.2.tar.gz +/yaml-0.8.18.7.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 6279078..038e00a 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -9,7 +9,7 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.18.1 +Version: 0.8.18.7 Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents @@ -19,7 +19,7 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra >= 1.6.7 +BuildRequires: ghc-rpm-macros-extra >= 1.6.9 # Begin cabal-rpm deps: BuildRequires: chrpath BuildRequires: ghc-aeson-devel @@ -121,6 +121,9 @@ cd %{pkg_name}-%{version} %changelog +* Tue Sep 27 2016 Jens Petersen - 0.8.18.7-1 +- update to 0.8.18.7 + * Wed Aug 31 2016 Jens Petersen - 0.8.18.1-1 - update to 0.8.18.1 - subpackage enclosed-exceptions dep diff --git a/sources b/sources index 9309ee0..021e533 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +6b809516f85490f2470f09d31e217034 yaml-0.8.18.7.tar.gz 2bcd17eba9cb1ebcb8da5fbccfbc6101 enclosed-exceptions-1.0.2.tar.gz -3f19c449c65c35d8c3785e11e61e611e yaml-0.8.18.1.tar.gz From 186e52ebd3230c7d1523f7ca09d8e2895b7082b6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 17:21:58 +0900 Subject: [PATCH 23/66] no longer need explicit ghc_fix_dynamic_rpath --- ghc-yaml.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 038e00a..29397ea 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -95,8 +95,6 @@ rm -r libyaml %install %ghc_libs_install %{subpkgver} %{pkgver} -%ghc_fix_dynamic_rpath json2yaml yaml2json - %check cd %{pkg_name}-%{version} From d1ea843247c76380722d6898f4d4ab697c564e60 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 17:49:37 +0900 Subject: [PATCH 24/66] chrpath BR is redundant --- ghc-yaml.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 29397ea..2f519c7 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -21,7 +21,6 @@ Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra >= 1.6.9 # Begin cabal-rpm deps: -BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel From 0c5f5d33c8b1b3a9b0258dd664f23da9c4013bd3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:36:46 +0900 Subject: [PATCH 25/66] bump --- ghc-yaml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 2f519c7..36221fa 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -10,7 +10,8 @@ Name: ghc-%{pkg_name} Version: 0.8.18.7 -Release: 1%{?dist} +# only reset when both packages bumped +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -118,6 +119,9 @@ cd %{pkg_name}-%{version} %changelog +* Tue Sep 27 2016 Jens Petersen - 0.8.18.7-2 +- bump + * Tue Sep 27 2016 Jens Petersen - 0.8.18.7-1 - update to 0.8.18.7 From 8b6e55429dc97d5bd2e3b3a28bbf6fc0087260f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jan 2017 11:57:48 +0900 Subject: [PATCH 26/66] unsubpackage enclosed-exceptions --- ghc-yaml.spec | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 36221fa..9783ed9 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -2,33 +2,29 @@ # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml -%global pkgver %{pkg_name}-%{version} -# https://bugzilla.redhat.com/show_bug.cgi?id=1374137 -%global subpkgver enclosed-exceptions-1.0.2 %bcond_with tests Name: ghc-%{pkg_name} Version: 0.8.18.7 -# only reset when both packages bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra >= 1.6.9 +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -#BuildRequires: ghc-enclosed-exceptions-devel +BuildRequires: ghc-enclosed-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel @@ -44,6 +40,7 @@ BuildRequires: ghc-aeson-qq-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-mockery-devel +BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps @@ -71,33 +68,24 @@ Requires: pkgconfig(yaml-0.1) This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{subpkgver} -%endif - -%global version %{main_version} - - %prep -%setup -q -c -n %{pkgver} -a1 -cd %{pkgver} +%setup -q -n %{pkg_name}-%{version} cabal-tweak-flag system-libyaml True # remove the bundled lib rm -r libyaml %build -%ghc_libs_build %{subpkgver} %{pkgver} +%ghc_lib_build %install -%ghc_libs_install %{subpkgver} %{pkgver} +%ghc_lib_install + +%ghc_fix_rpath %{pkg_name}-%{version} %check -cd %{pkg_name}-%{version} %cabal_test @@ -113,12 +101,15 @@ cd %{pkg_name}-%{version} %files devel -f %{name}-devel.files -%doc %{pkgver}/ChangeLog.md %{pkgver}/README.md %{pkgver}/examples +%doc ChangeLog.md README.md examples %{_bindir}/json2yaml %{_bindir}/yaml2json %changelog +* Fri Jan 6 2017 Jens Petersen - 0.8.18.7-3 +- unsubpackage enclosed-exceptions + * Tue Sep 27 2016 Jens Petersen - 0.8.18.7-2 - bump From c8522ee06f6a94027190ded1c626709678aea75c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Jan 2017 21:10:38 +0900 Subject: [PATCH 27/66] list LICENSE explicitly --- ghc-yaml.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 9783ed9..c01ae89 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.10.1 +# generated by cabal-rpm-0.11 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml @@ -98,6 +98,7 @@ rm -r libyaml %files -f %{name}.files +%license LICENSE %files devel -f %{name}-devel.files From 78f94fefd0418cea99ea4aae70ddca3eeed0ab2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:54:16 +0000 Subject: [PATCH 28/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index c01ae89..23f5eb0 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} Version: 0.8.18.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -108,6 +108,9 @@ rm -r libyaml %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.8.18.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 6 2017 Jens Petersen - 0.8.18.7-3 - unsubpackage enclosed-exceptions From 4bc4e72065e02f2db992d68133ebbc73eb75434c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Feb 2017 12:19:35 +0900 Subject: [PATCH 29/66] update to 0.8.21.2 --- .gitignore | 1 + ghc-yaml.spec | 18 +++++++++++------- sources | 3 +-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 24126fd..1782211 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /yaml-0.8.18.1.tar.gz /enclosed-exceptions-1.0.2.tar.gz /yaml-0.8.18.7.tar.gz +/yaml-0.8.21.2.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 23f5eb0..9d5a439 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,18 +1,19 @@ -# generated by cabal-rpm-0.11 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.18.7 -Release: 4%{?dist} +Version: 0.8.21.2 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents 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 @@ -29,6 +30,7 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-semigroups-devel +BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel @@ -69,7 +71,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} cabal-tweak-flag system-libyaml True # remove the bundled lib rm -r libyaml @@ -81,8 +83,7 @@ rm -r libyaml %install %ghc_lib_install - -%ghc_fix_rpath %{pkg_name}-%{version} +%ghc_fix_rpath %{pkgver} %check @@ -108,6 +109,9 @@ rm -r libyaml %changelog +* Wed Feb 22 2017 Jens Petersen - 0.8.21.2-1 +- update to 0.8.21.2 + * Fri Feb 10 2017 Fedora Release Engineering - 0.8.18.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 021e533..fa4aef0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -6b809516f85490f2470f09d31e217034 yaml-0.8.18.7.tar.gz -2bcd17eba9cb1ebcb8da5fbccfbc6101 enclosed-exceptions-1.0.2.tar.gz +SHA512 (yaml-0.8.21.2.tar.gz) = 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa From 5e07941c23eea9b37b2f13c39b10a25aadd5afda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:02:46 +0000 Subject: [PATCH 30/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 9d5a439..0c5d0db 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.21.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -109,6 +109,9 @@ rm -r libyaml %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.8.21.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jens Petersen - 0.8.21.2-1 - update to 0.8.21.2 From 4c9960727a7bddb65ad64ae4945e7e0481e0b0d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:38:19 +0000 Subject: [PATCH 31/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 0c5d0db..68f1fbd 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.21.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -109,6 +109,9 @@ rm -r libyaml %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.8.21.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.8.21.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5ddeb699af1cd28d8938feaf10103a6baf599d79 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:25 +0100 Subject: [PATCH 32/66] refresh to cabal-rpm-0.12.1 --- ghc-yaml.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 68f1fbd..9276d5f 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.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 yaml @@ -58,9 +58,12 @@ interface based around the JSON datatypes provided by the 'aeson' package. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: Requires: pkgconfig(yaml-0.1) @@ -90,6 +93,12 @@ rm -r libyaml %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 7fc1d775f09a4300be465dbff6ef5fe2523ab2b5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 16:02:32 +0100 Subject: [PATCH 33/66] update to 0.8.25.1 --- .gitignore | 1 + ghc-yaml.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1782211..ca6f886 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /enclosed-exceptions-1.0.2.tar.gz /yaml-0.8.18.7.tar.gz /yaml-0.8.21.2.tar.gz +/yaml-0.8.25.1.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 9276d5f..e684c05 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.21.2 -Release: 3%{?dist} +Version: 0.8.25.1 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -25,7 +25,6 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-enclosed-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel @@ -38,7 +37,6 @@ BuildRequires: ghc-vector-devel BuildRequires: pkgconfig(yaml-0.1) %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-aeson-qq-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-mockery-devel @@ -118,6 +116,9 @@ rm -r libyaml %changelog +* Wed Jan 24 2018 Jens Petersen - 0.8.25.1-1 +- update to 0.8.25.1 + * Wed Aug 02 2017 Fedora Release Engineering - 0.8.21.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index fa4aef0..45ed387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-0.8.21.2.tar.gz) = 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa +SHA512 (yaml-0.8.25.1.tar.gz) = c5a93c1c06991c35ca39d689c83e2e62bdb8f6fdb7e6dd36813f27a46df63a367eda9c104c7200827f4b4bc57e086621f3d62f5bc92dc23023ddd7ffe525a7bd From 22297c79da5651523e350d49ed66215dd34f1b3d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:51 +0900 Subject: [PATCH 34/66] drop ldconfig scriptlets --- ghc-yaml.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index e684c05..675b1bd 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -91,12 +91,6 @@ rm -r libyaml %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 2a110aaecc5180f945b2e9f1e5781cbbffe9dc93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:23:41 +0000 Subject: [PATCH 35/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 675b1bd..aae185b 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.25.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -110,6 +110,9 @@ rm -r libyaml %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.8.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.8.25.1-1 - update to 0.8.25.1 From b48da80aef1a255ad51da8bb3952e10beff337fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:17:49 +0000 Subject: [PATCH 36/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index aae185b..aba00d1 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.25.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -110,6 +110,9 @@ rm -r libyaml %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.25.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.8.25.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From cb7613207e626e21123fb88d94db8ed0a410e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:56 +0200 Subject: [PATCH 37/66] Rebuilt for #1607054 --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index aba00d1..41c8b0e 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.25.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -110,6 +110,9 @@ rm -r libyaml %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.8.25.1-4 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.8.25.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fdef62997468698a2be747951e360afff6fd5e3b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jul 2018 22:39:07 -0700 Subject: [PATCH 38/66] Disable annotated build to work around #1607054 --- ghc-yaml.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 41c8b0e..f2670ca 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.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 yaml %global pkgver %{pkg_name}-%{version} From 53b78c0448f43ecb7bd46fd3e4dd2567fa6ca3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Jul 2018 19:17:02 +0200 Subject: [PATCH 39/66] Enable annotated build again This reverts commit fdef62997468698a2be747951e360afff6fd5e3b. --- ghc-yaml.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index f2670ca..36ca89c 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,9 +1,6 @@ # 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 yaml %global pkgver %{pkg_name}-%{version} @@ -11,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.25.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -113,6 +110,9 @@ rm -r libyaml %changelog +* Tue Jul 24 2018 Miro Hrončok - 0.8.25.1-5 +- Enable annotated build again + * Mon Jul 23 2018 Miro Hrončok - 0.8.25.1-4 - Rebuilt for #1607054 From 1ab7eb1783f7db4ae856018bfc9fa57c4a66f014 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:50:53 +0900 Subject: [PATCH 40/66] update to 0.8.32 --- .gitignore | 2 ++ ghc-yaml.spec | 13 ++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ca6f886..63498dc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /yaml-0.8.18.7.tar.gz /yaml-0.8.21.2.tar.gz /yaml-0.8.25.1.tar.gz +/yaml-0.8.31.1.tar.gz +/yaml-0.8.32.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 36ca89c..619fb96 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.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 yaml @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.25.1 -Release: 5%{?dist} +Version: 0.8.32 +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -18,7 +18,6 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.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 @@ -84,7 +83,6 @@ rm -r libyaml %install %ghc_lib_install -%ghc_fix_rpath %{pkgver} %check @@ -105,11 +103,12 @@ rm -r libyaml %files devel -f %{name}-devel.files %doc ChangeLog.md README.md examples -%{_bindir}/json2yaml -%{_bindir}/yaml2json %changelog +* Thu Jul 26 2018 Jens Petersen - 0.8.32-1 +- update to 0.8.32 + * Tue Jul 24 2018 Miro Hrončok - 0.8.25.1-5 - Enable annotated build again diff --git a/sources b/sources index 45ed387..89f9e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-0.8.25.1.tar.gz) = c5a93c1c06991c35ca39d689c83e2e62bdb8f6fdb7e6dd36813f27a46df63a367eda9c104c7200827f4b4bc57e086621f3d62f5bc92dc23023ddd7ffe525a7bd +SHA512 (yaml-0.8.32.tar.gz) = 0d221441b23e4df6783ca93b9a8fb4b25ca7e472ee963206cc6967c300f4c3e17a965b57d34675f94cf31ec59c88d773569b4aa17d198e7e5edeb3343f9bebde From 85a4e3e2e439ac17c591bdbc9e14b6555af57f38 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Aug 2018 06:40:48 +0200 Subject: [PATCH 41/66] bump --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 619fb96..ac1530e 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.32 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -106,6 +106,9 @@ rm -r libyaml %changelog +* Tue Aug 7 2018 Jens Petersen - 0.8.32-2 +- rebuild (for missing symbols on i686) + * Thu Jul 26 2018 Jens Petersen - 0.8.32-1 - update to 0.8.32 From 176ee31ea75a072d622ba9d1470743e13ef64949 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Aug 2018 07:31:54 +0200 Subject: [PATCH 42/66] use bundled libyaml to see if it fixes missing symbols --- ghc-yaml.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index ac1530e..787e5af 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.32 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -42,6 +42,7 @@ BuildRequires: ghc-mockery-devel BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps +Provides: bundled(libyaml) = 0.2.1 %description Provides support for parsing and emitting Yaml documents. @@ -72,9 +73,11 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} -cabal-tweak-flag system-libyaml True -# remove the bundled lib -rm -r libyaml + +# getting missing symbols with libyaml-0.2.1-1.fc29 +##cabal-tweak-flag system-libyaml True +### remove the bundled lib +##rm -r libyaml %build @@ -106,8 +109,13 @@ rm -r libyaml %changelog +* Tue Aug 7 2018 Jens Petersen - 0.8.32-3 +- try using the bundled libyaml to see if it fixes missing symbols + * Tue Aug 7 2018 Jens Petersen - 0.8.32-2 -- rebuild (for missing symbols on i686) +- rebuild + +* Wed Aug 1 2018 Jens Petersen - 0.8.32-2 * Thu Jul 26 2018 Jens Petersen - 0.8.32-1 - update to 0.8.32 From ed3a1ae4b8c8194e5b97ecbcd565b9dbab80412b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:16:42 +0000 Subject: [PATCH 43/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 787e5af..5575627 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -109,6 +109,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.8.32-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 7 2018 Jens Petersen - 0.8.32-3 - try using the bundled libyaml to see if it fixes missing symbols From 7bf41eb550dfe5f22afaacefde23b97ee8810cec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:48:01 +0800 Subject: [PATCH 44/66] refresh to cabal-rpm-0.13 --- ghc-yaml.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 5575627..ee6e4ba 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.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 yaml @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.8.32 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for parsing and rendering YAML documents 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-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel @@ -33,7 +35,6 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -BuildRequires: pkgconfig(yaml-0.1) %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-base-compat-devel @@ -63,17 +64,15 @@ Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} -# Begin cabal-rpm deps: -Requires: pkgconfig(yaml-0.1) -# End cabal-rpm deps %description devel This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} - +# End cabal-rpm setup # getting missing symbols with libyaml-0.2.1-1.fc29 ##cabal-tweak-flag system-libyaml True ### remove the bundled lib @@ -81,11 +80,15 @@ This package provides the Haskell %{pkg_name} library development files. %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 @@ -101,7 +104,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 @@ -109,6 +114,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.8.32-5 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.8.32-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From abcd601b50d7aca317c4981d0ac10d0f4904036f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:16:59 +0000 Subject: [PATCH 45/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index ee6e4ba..3ee6a97 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.8.32 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.32-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.8.32-5 - refresh to cabal-rpm-0.13 From 970c0904b62722eceb9cabf5ba54df0458fbe9ac Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:27:12 +0000 Subject: [PATCH 46/66] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-yaml.spec | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 3ee6a97..34fa456 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.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 yaml @@ -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-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -57,11 +63,8 @@ interface based around the JSON datatypes provided by the 'aeson' package. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -69,6 +72,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} @@ -95,14 +117,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 @@ -113,6 +127,16 @@ This package provides the Haskell %{pkg_name} library development files. %doc ChangeLog.md README.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 - 0.8.32-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 00056c330326b360b51f673d608485c406ad76d6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 17:05:07 +0000 Subject: [PATCH 47/66] update to 0.11.1.0 subpackage libyaml --- .gitignore | 2 ++ ghc-yaml.spec | 48 +++++++++++++++++++++++++++++++++++++----------- sources | 3 ++- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 63498dc..d8a5678 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /yaml-0.8.25.1.tar.gz /yaml-0.8.31.1.tar.gz /yaml-0.8.32.tar.gz +/yaml-0.11.1.0.tar.gz +/libyaml-0.1.1.0.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 34fa456..d2764a9 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,20 +1,25 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml %global pkgver %{pkg_name}-%{version} +%global libyaml libyaml-0.1.1.0 +%global subpkgs %{libyaml} + %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.32 -Release: 6%{?dist} +Version: 0.11.1.0 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Support for parsing and rendering YAML documents 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/%{libyaml}/%{libyaml}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -25,7 +30,8 @@ BuildRequires: ghc-doc %if %{with ghc_prof} BuildRequires: ghc-prof %endif -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-bytestring-devel @@ -33,9 +39,10 @@ BuildRequires: ghc-conduit-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel +#BuildRequires: ghc-libyaml-devel +BuildRequires: ghc-mtl-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-scientific-devel -BuildRequires: ghc-semigroups-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel @@ -46,10 +53,11 @@ BuildRequires: ghc-HUnit-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-mockery-devel +BuildRequires: ghc-raw-strings-qq-devel BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps -Provides: bundled(libyaml) = 0.2.1 +BuildRequires: libyaml-devel %description Provides support for parsing and emitting Yaml documents. @@ -91,25 +99,39 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{libyaml} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup -# getting missing symbols with libyaml-0.2.1-1.fc29 -##cabal-tweak-flag system-libyaml True -### remove the bundled lib -##rm -r libyaml +( +cd %{libyaml} +cabal-tweak-flag system-libyaml True +# remove the bundled lib +rm -r libyaml_src +) %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -138,6 +160,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 0.11.1.0-1 +- update to 0.11.1.0 +- subpackage libyaml + * Thu Jul 25 2019 Fedora Release Engineering - 0.8.32-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 89f9e33..e79acdd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (yaml-0.8.32.tar.gz) = 0d221441b23e4df6783ca93b9a8fb4b25ca7e472ee963206cc6967c300f4c3e17a965b57d34675f94cf31ec59c88d773569b4aa17d198e7e5edeb3343f9bebde +SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 +SHA512 (yaml-0.11.1.0.tar.gz) = 4f166b9d7ee6aadde3f2cde2b0b5f4884d07d3a272117c2fd6aa13ab1b472aa0b07603a2a8c7e8ebb52e1d4fba8d1a03df5126b25a0b58432af3b1ed1ed3440e From 612d2ddc2be472bf1afa82d107a28a731e0ebaec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:33:11 +0800 Subject: [PATCH 48/66] BR prof for lib and static for executable --- ghc-yaml.spec | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index d2764a9..132c295 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml @@ -24,30 +24,25 @@ Source1: https://hackage.haskell.org/package/%{libyaml}/%{libyaml}.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-extra +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-conduit-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-directory-prof +BuildRequires: ghc-filepath-prof +#BuildRequires: ghc-libyaml-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-resourcet-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-vector-prof BuildRequires: chrpath -BuildRequires: ghc-aeson-devel -BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-conduit-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel -#BuildRequires: ghc-libyaml-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-scientific-devel -BuildRequires: ghc-template-haskell-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unordered-containers-devel -BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-base-compat-devel @@ -71,6 +66,7 @@ interface based around the JSON datatypes provided by the 'aeson' package. %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 b1c97a6c82fc1a1c242aede99297603642431f20 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Aug 2019 22:25:37 +0200 Subject: [PATCH 49/66] enable system libyaml with patch --- ghc-yaml.spec | 10 +++++++--- system-libyaml.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 system-libyaml.patch diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 132c295..829bc85 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.1.0 # can only be reset when all subpkgs bumped -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -21,6 +21,7 @@ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{libyaml}/%{libyaml}.tar.gz # End cabal-rpm sources +Patch1: system-libyaml.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -98,7 +99,7 @@ This package provides the Haskell %{pkg_name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{libyaml} +%ghc_lib_subpackage -c libyaml-devel%{?_isa} %{libyaml} %endif %global version %{main_version} @@ -108,9 +109,9 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} -a1 # End cabal-rpm setup +%patch1 -p1 -b .orig ( cd %{libyaml} -cabal-tweak-flag system-libyaml True # remove the bundled lib rm -r libyaml_src ) @@ -156,6 +157,9 @@ rm -r libyaml_src %changelog +* Thu Aug 8 2019 Jens Petersen - 0.11.1.0-2 +- patch .cabal for system libyaml + * Thu Jul 25 2019 Jens Petersen - 0.11.1.0-1 - update to 0.11.1.0 - subpackage libyaml diff --git a/system-libyaml.patch b/system-libyaml.patch new file mode 100644 index 0000000..55ecb3c --- /dev/null +++ b/system-libyaml.patch @@ -0,0 +1,13 @@ +--- yaml-0.11.1.0/libyaml-0.1.1.0/libyaml.cabal~ 2019-02-12 09:55:57.000000000 +0100 ++++ yaml-0.11.1.0/libyaml-0.1.1.0/libyaml.cabal 2019-08-08 22:15:56.350202056 +0200 +@@ -38,8 +38,8 @@ + + flag system-libyaml + description: Use the system-wide libyaml instead of the bundled copy +- manual: False +- default: False ++ manual: True ++ default: True + + library + exposed-modules: From 6efec4ae6abb4838a80b4673f3fdb84cddcf85a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:46:05 +0000 Subject: [PATCH 50/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 829bc85..6eca012 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.1.0 # can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -157,6 +157,9 @@ rm -r libyaml_src %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.11.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 8 2019 Jens Petersen - 0.11.1.0-2 - patch .cabal for system libyaml From d7671b39d3bdcd4a2a0639186ecb5d334046c0e1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 7 Feb 2020 00:19:54 +0800 Subject: [PATCH 51/66] refresh to cabal-rpm-2.0.2 --- ghc-yaml.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 6eca012..4626b10 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 --subpackage +# generated by cabal-rpm-2.0.2 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name yaml @@ -7,8 +7,6 @@ %global libyaml libyaml-0.1.1.0 %global subpkgs %{libyaml} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.11.1.0 # can only be reset when all subpkgs bumped @@ -43,15 +41,6 @@ BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof -BuildRequires: chrpath -%if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-base-compat-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-mockery-devel -BuildRequires: ghc-raw-strings-qq-devel -BuildRequires: ghc-temporary-devel -%endif # End cabal-rpm deps BuildRequires: libyaml-devel @@ -80,6 +69,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. @@ -90,6 +80,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. @@ -132,8 +123,14 @@ rm -r libyaml_src # 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 @@ -148,6 +145,7 @@ rm -r libyaml_src %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From cc0f0e4fc325c7b5a1ec99bbe70f35730609e330 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:37:49 +0800 Subject: [PATCH 52/66] update to 0.11.2.0 --- .gitignore | 1 + ghc-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8a5678..9c6056d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /yaml-0.8.32.tar.gz /yaml-0.11.1.0.tar.gz /libyaml-0.1.1.0.tar.gz +/yaml-0.11.2.0.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 4626b10..6169647 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,9 +8,9 @@ %global subpkgs %{libyaml} Name: ghc-%{pkg_name} -Version: 0.11.1.0 +Version: 0.11.2.0 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -155,6 +155,9 @@ rm -r libyaml_src %changelog +* Fri Feb 14 2020 Jens Petersen - 0.11.2.0-4 +- update to 0.11.2.0 + * Tue Jan 28 2020 Fedora Release Engineering - 0.11.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e79acdd..7f50aa5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 -SHA512 (yaml-0.11.1.0.tar.gz) = 4f166b9d7ee6aadde3f2cde2b0b5f4884d07d3a272117c2fd6aa13ab1b472aa0b07603a2a8c7e8ebb52e1d4fba8d1a03df5126b25a0b58432af3b1ed1ed3440e +SHA512 (yaml-0.11.2.0.tar.gz) = b90580ca37066401558c1a19148f70f6153a7f44f65ade99827adf20a4ba04edb8a9d6101b507014b92970d4bbe89c0fd89792a62206a2fbdc7ae5ff08915885 From 49ba27c7eb174a474c063f604726300599d42455 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:29:14 +0800 Subject: [PATCH 53/66] refresh to cabal-rpm-2.0.5 --- ghc-yaml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 6169647..84143fc 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 --subpackage -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 --subpackage +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name yaml %global pkgver %{pkg_name}-%{version} From 989f239661950c988908df5c420391a2a3d6b08e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 12:04:06 +0800 Subject: [PATCH 54/66] update to 0.11.4.0 --- .gitignore | 1 + ghc-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9c6056d..0418700 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /yaml-0.11.1.0.tar.gz /libyaml-0.1.1.0.tar.gz /yaml-0.11.2.0.tar.gz +/yaml-0.11.4.0.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 84143fc..09b9326 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -8,9 +8,9 @@ %global subpkgs %{libyaml} Name: ghc-%{pkg_name} -Version: 0.11.2.0 +Version: 0.11.4.0 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -155,6 +155,9 @@ rm -r libyaml_src %changelog +* Wed Jun 10 2020 Jens Petersen - 0.11.4.0-5 +- update to 0.11.4.0 + * Fri Feb 14 2020 Jens Petersen - 0.11.2.0-4 - update to 0.11.2.0 diff --git a/sources b/sources index 7f50aa5..305eea8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 -SHA512 (yaml-0.11.2.0.tar.gz) = b90580ca37066401558c1a19148f70f6153a7f44f65ade99827adf20a4ba04edb8a9d6101b507014b92970d4bbe89c0fd89792a62206a2fbdc7ae5ff08915885 +SHA512 (yaml-0.11.4.0.tar.gz) = bed04ff53a7ebce6fc117fc1986e9ff95cae6f2de0e050b0f8607abc42d057e34a31e0cbda23def6a0caf15eb20b946af8869daf7e6df9c5797ce241057bb5fc From 18c8167d549d7446cf77632d21fa2ffda61631ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:52 +0800 Subject: [PATCH 55/66] refresh to cabal-rpm-2.0.6 --- ghc-yaml.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 09b9326..361e804 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 --subpackage +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name yaml @@ -7,6 +7,8 @@ %global libyaml libyaml-0.1.1.0 %global subpkgs %{libyaml} +# testsuite missing deps: raw-strings-qq + Name: ghc-%{pkg_name} Version: 0.11.4.0 # can only be reset when all subpkgs bumped @@ -123,16 +125,6 @@ rm -r libyaml_src # 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 810e42ef88273f9ac789f3402cc571feb512b05f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:55:42 +0000 Subject: [PATCH 56/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 361e804..8af0dca 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.4.0 # can only be reset when all subpkgs bumped -Release: 5%{?dist} +Release: 6%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -147,6 +147,9 @@ rm -r libyaml_src %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.11.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 10 2020 Jens Petersen - 0.11.4.0-5 - update to 0.11.4.0 From e8391a024dad2b2e8125fd0ec5892a478832ddc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:45:29 +0000 Subject: [PATCH 57/66] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 8af0dca..b1507c5 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.4.0 # can only be reset when all subpkgs bumped -Release: 6%{?dist} +Release: 7%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -147,6 +147,10 @@ rm -r libyaml_src %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.11.4.0-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.11.4.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e1436dcacf6405f7c638bf4997cf11b704d5bfde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:59:34 +0000 Subject: [PATCH 58/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index b1507c5..b0669c1 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.4.0 # can only be reset when all subpkgs bumped -Release: 7%{?dist} +Release: 8%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -147,6 +147,9 @@ rm -r libyaml_src %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.11.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.11.4.0-7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d4e921eae55ec6af90e65eddbc900096f4a32ba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:32:01 +0000 Subject: [PATCH 59/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index b0669c1..2500e1a 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.4.0 # can only be reset when all subpkgs bumped -Release: 8%{?dist} +Release: 9%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -147,6 +147,9 @@ rm -r libyaml_src %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.11.4.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.11.4.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e81b7852bde7ceeeceb1fc13dae71861ca1ec02f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:00:41 +0800 Subject: [PATCH 60/66] update to 0.11.5.0 --- .gitignore | 1 + ghc-yaml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0418700..cf254ec 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libyaml-0.1.1.0.tar.gz /yaml-0.11.2.0.tar.gz /yaml-0.11.4.0.tar.gz +/yaml-0.11.5.0.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 2500e1a..e0dc5ac 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -10,7 +10,7 @@ # testsuite missing deps: raw-strings-qq Name: ghc-%{pkg_name} -Version: 0.11.4.0 +Version: 0.11.5.0 # can only be reset when all subpkgs bumped Release: 9%{?dist} Summary: Support for parsing and rendering YAML documents @@ -147,6 +147,9 @@ rm -r libyaml_src %changelog +* Thu Aug 5 2021 Jens Petersen - 0.11.5.0-9 +- update to 0.11.5.0 + * Thu Jul 22 2021 Fedora Release Engineering - 0.11.4.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 305eea8..e89f38d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 -SHA512 (yaml-0.11.4.0.tar.gz) = bed04ff53a7ebce6fc117fc1986e9ff95cae6f2de0e050b0f8607abc42d057e34a31e0cbda23def6a0caf15eb20b946af8869daf7e6df9c5797ce241057bb5fc +SHA512 (yaml-0.11.5.0.tar.gz) = a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b From ed2649aa7a476674b140337f96cd0a1f4778d4f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 61/66] refresh to cabal-rpm-2.0.9 --- ghc-yaml.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index e0dc5ac..dbefc60 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name yaml @@ -72,6 +72,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 d2d8c43e200ffa9981a5ee5bed6cce5191bc755d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 8 Aug 2021 06:03:30 +0800 Subject: [PATCH 62/66] bump release --- ghc-yaml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index dbefc60..650627b 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.5.0 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -148,7 +148,7 @@ rm -r libyaml_src %changelog -* Thu Aug 5 2021 Jens Petersen - 0.11.5.0-9 +* Sun Aug 8 2021 Jens Petersen - 0.11.5.0-10 - update to 0.11.5.0 * Thu Jul 22 2021 Fedora Release Engineering - 0.11.4.0-9 From dcda227235ab24cded83265cb52e4ebd5d5a13c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:52:14 +0000 Subject: [PATCH 63/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 650627b..3a60af6 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.5.0 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 11%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -148,6 +148,9 @@ rm -r libyaml_src %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.11.5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Aug 8 2021 Jens Petersen - 0.11.5.0-10 - update to 0.11.5.0 From 74fe5dec34954fa042773ad4a2d6abe4bc0b9f1d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Mar 2022 14:57:25 +0800 Subject: [PATCH 64/66] bump release --- ghc-yaml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-yaml.spec b/ghc-yaml.spec index 3a60af6..a3bc1fb 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.11.5.0 # can only be reset when all subpkgs bumped -Release: 11%{?dist} +Release: 12%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -148,6 +148,9 @@ rm -r libyaml_src %changelog +* Thu Mar 10 2022 Jens Petersen - 0.11.5.0-12 +- rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.11.5.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 245071857b3ce641267899835d24b9a91649d5ba Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 15:26:14 +0800 Subject: [PATCH 65/66] update to 0.11.8.0 --- .gitignore | 1 + ghc-yaml.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf254ec..d0c3587 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /yaml-0.11.2.0.tar.gz /yaml-0.11.4.0.tar.gz /yaml-0.11.5.0.tar.gz +/yaml-0.11.8.0.tar.gz diff --git a/ghc-yaml.spec b/ghc-yaml.spec index a3bc1fb..781068f 100644 --- a/ghc-yaml.spec +++ b/ghc-yaml.spec @@ -10,9 +10,9 @@ # testsuite missing deps: raw-strings-qq Name: ghc-%{pkg_name} -Version: 0.11.5.0 +Version: 0.11.8.0 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: Support for parsing and rendering YAML documents License: BSD @@ -148,6 +148,9 @@ rm -r libyaml_src %changelog +* Tue Jun 07 2022 Jens Petersen - 0.11.8.0-13 +- https://hackage.haskell.org/package/yaml-0.11.8.0/changelog + * Thu Mar 10 2022 Jens Petersen - 0.11.5.0-12 - rebuild diff --git a/sources b/sources index e89f38d..487d7e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 -SHA512 (yaml-0.11.5.0.tar.gz) = a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b +SHA512 (yaml-0.11.8.0.tar.gz) = f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7 From 66400e8aa16c2a4dcbb865afe41599472d09fdd8 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:13:23 +0300 Subject: [PATCH 66/66] Remove unnecessary files --- sources | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 487d7e8..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0 -SHA512 (yaml-0.11.8.0.tar.gz) = f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7