From 41fc51632f349fa12c8badc6b8a1fa0d503b3ccc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 26 Sep 2017 21:32:50 +0000 Subject: [PATCH 01/30] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d6d59e9 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-connection + +The ghc-connection package \ No newline at end of file From 59c3c6a2f966782167620a020736fe11ef9d9a15 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 26 Sep 2017 17:40:00 -0400 Subject: [PATCH 02/30] Initial import (#1495476). --- .gitignore | 1 + README.md | 3 -- ghc-connection.spec | 100 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-connection.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e55c3a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/connection-0.2.8.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index d6d59e9..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-connection - -The ghc-connection package \ No newline at end of file diff --git a/ghc-connection.spec b/ghc-connection.spec new file mode 100644 index 0000000..0d8ede7 --- /dev/null +++ b/ghc-connection.spec @@ -0,0 +1,100 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name connection +%global pkgver %{pkg_name}-%{version} + +Name: ghc-%{pkg_name} +Version: 0.2.8 +Release: 1.git.0.4b72954%{?dist} +Summary: Simple and easy network connections API + +License: BSD +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-byteable-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-class-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-socks-devel +BuildRequires: ghc-tls-devel +BuildRequires: ghc-x509-devel +BuildRequires: ghc-x509-store-devel +BuildRequires: ghc-x509-system-devel +BuildRequires: ghc-x509-validation-devel +# End cabal-rpm deps + +%description +Simple network library for all your connection need. + +Features: Really simple to use, SSL/TLS, SOCKS. + +This library provides a very simple api to create sockets to a destination with +the choice of SSL/TLS, and SOCKS. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkgver} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files +%doc CHANGELOG.md README.md + + +%changelog +* Tue Sep 26 2017 Elliott Sales de Andrade 0.2.8-1 +- Update to latest spec template. +- Update to latest version. + +* Fri Jul 21 2017 Elliott Sales de Andrade 0.2.5-5 +- Bump for Fedora 26. + +* Sat Dec 17 2016 Elliott Sales de Andrade - 0.2.5-4 +- spec file generated by cabal-rpm-0.10.0 +- Update release to be newer than previous builds + +* Sun May 01 2016 Elliott Sales de Andrade - 0.2.5-3 +- Bump to rebuild against new dependencies + +* Mon Apr 25 2016 Elliott Sales de Andrade - 0.2.5-2 +- Bump to rebuild with new dependencies + +* Sun Aug 23 2015 Ben Boeckel - 0.2.5-1 +- initial package diff --git a/sources b/sources new file mode 100644 index 0000000..17a85c2 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (connection-0.2.8.tar.gz) = 59202159d8d9233d1786c75470892da1a577d7a82a8bb8f5c75d52ade7be227c5619fd6fdebf7f60d4e240b31e3b791df266c97787e3fe7814da380147f9c9c5 From ef1ec6b0b52ad3675cae284f7139a1f7fc8f5570 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 26 Sep 2017 17:40:36 -0400 Subject: [PATCH 03/30] Fix release number. --- ghc-connection.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 0d8ede7..9ec86b7 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 1.git.0.4b72954%{?dist} +Release: 1%{?dist} Summary: Simple and easy network connections API License: BSD From c348e98274f50a49cb86840293a865c988edc31e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:50 +0100 Subject: [PATCH 04/30] refresh to cabal-rpm-0.12.1 --- ghc-connection.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 9ec86b7..8979909 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name connection @@ -41,9 +41,12 @@ the choice of SSL/TLS, and SOCKS. %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 @@ -62,6 +65,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 66f19a8483c7ae1fc6e9bc286f8e4b922a710666 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:25:30 +0100 Subject: [PATCH 05/30] bump release --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 8979909..2cd71a4 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple and easy network connections API License: BSD @@ -88,6 +88,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 26 2018 Jens Petersen - 0.2.8-2 +- rebuild + * Tue Sep 26 2017 Elliott Sales de Andrade 0.2.8-1 - Update to latest spec template. - Update to latest version. From 57ed5aa564c98f7b18a542a640e281f9cb966b2e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:13 +0900 Subject: [PATCH 06/30] drop ldconfig scriptlets --- ghc-connection.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 2cd71a4..75b107f 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -65,12 +65,6 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 754bc088f73c6c730f135a617c096af33b437344 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:27:51 +0000 Subject: [PATCH 07/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 75b107f..16bdca0 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple and easy network connections API License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 0.2.8-2 - rebuild From 0d6584cf589a162e5dfa9ec1f4b8877851fdc5ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:40:02 +0000 Subject: [PATCH 08/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 16bdca0..72e9d87 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple and easy network connections API License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 628b97b1f927f6ebe3fa9d8d055a36050d651b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:38 +0200 Subject: [PATCH 09/30] Rebuilt for #1607054 --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 72e9d87..00529cc 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple and easy network connections API License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.2.8-5 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6d5243086e65f785797e7dd0ca7e02590137f5bc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 29 Jul 2018 01:06:17 +0900 Subject: [PATCH 10/30] rebuild --- ghc-connection.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 00529cc..7641142 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple and easy network connections API License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 0.2.8-6 +- rebuild + * Mon Jul 23 2018 Miro Hrončok - 0.2.8-5 - Rebuilt for #1607054 From 84d93427d68fb7785661dd90c91d9b30f82c0513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:19:55 +0000 Subject: [PATCH 11/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 7641142..b5b7f28 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple and easy network connections API License: BSD @@ -82,6 +82,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.2.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.2.8-6 - rebuild From 86faa0c76f29d7fa59727253abc03c048ff9f0df Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:44:03 +0800 Subject: [PATCH 12/30] refresh to cabal-rpm-0.13 --- connection-0.2.8.cabal | 44 ++++++++++++++++++++++++++++++++++++++++++ ghc-connection.spec | 21 +++++++++++++++++--- 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 connection-0.2.8.cabal diff --git a/connection-0.2.8.cabal b/connection-0.2.8.cabal new file mode 100644 index 0000000..3669436 --- /dev/null +++ b/connection-0.2.8.cabal @@ -0,0 +1,44 @@ +Name: connection +Version: 0.2.8 +x-revision: 1 +Description: + Simple network library for all your connection need. + . + Features: Really simple to use, SSL/TLS, SOCKS. + . + This library provides a very simple api to create sockets + to a destination with the choice of SSL/TLS, and SOCKS. +License: BSD3 +License-file: LICENSE +Copyright: Vincent Hanquez +Author: Vincent Hanquez +Maintainer: Vincent Hanquez +Synopsis: Simple and easy network connections API +Build-Type: Simple +Category: Network +stability: experimental +Cabal-Version: >=1.6 +Homepage: http://github.com/vincenthz/hs-connection +extra-source-files: README.md + CHANGELOG.md + +Library + Build-Depends: base >= 3 && < 5 + , bytestring + , byteable + , containers + , data-default-class + , network >= 2.3 && < 2.9 + , tls >= 1.3 + , socks >= 0.5.5 + , x509 >= 1.5 + , x509-store >= 1.5 + , x509-system >= 1.5 + , x509-validation >= 1.5 + Exposed-modules: Network.Connection + Other-modules: Network.Connection.Types + ghc-options: -Wall + +source-repository head + type: git + location: https://github.com/vincenthz/hs-connection diff --git a/ghc-connection.spec b/ghc-connection.spec index b5b7f28..b8afb40 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -6,16 +6,19 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple and easy network connections API 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: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-byteable-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel @@ -54,15 +57,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %post devel @@ -74,7 +84,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 @@ -82,6 +94,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.2.8-8 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.2.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 18ef19cc4d4b91b21c6767b136ed49dfe710db96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:16:12 +0000 Subject: [PATCH 13/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index b8afb40..5c03c93 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple and easy network connections API License: BSD @@ -94,6 +94,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.2.8-8 - refresh to cabal-rpm-0.13 From e7844d4cb06bb0d33978925a555403920b673757 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:18 +0000 Subject: [PATCH 14/30] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-connection.spec | 48 +++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 5c03c93..468e9c3 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -18,6 +18,12 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-byteable-devel BuildRequires: ghc-bytestring-devel @@ -44,11 +50,8 @@ the choice of SSL/TLS, and SOCKS. %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} @@ -75,14 +97,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # 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,6 +107,16 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %doc CHANGELOG.md README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 0.2.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4de615432f26c1d2db334121a8cc078db96898c2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Jul 2019 15:34:48 +0000 Subject: [PATCH 15/30] cabal-rpm-1.0.0: add doc and prof subpkgs --- connection-0.2.8.cabal | 4 ++-- ghc-connection.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/connection-0.2.8.cabal b/connection-0.2.8.cabal index 3669436..886e28e 100644 --- a/connection-0.2.8.cabal +++ b/connection-0.2.8.cabal @@ -1,6 +1,6 @@ Name: connection Version: 0.2.8 -x-revision: 1 +x-revision: 2 Description: Simple network library for all your connection need. . @@ -30,7 +30,7 @@ Library , data-default-class , network >= 2.3 && < 2.9 , tls >= 1.3 - , socks >= 0.5.5 + , socks >= 0.5.5 && < 0.6 , x509 >= 1.5 , x509-store >= 1.5 , x509-system >= 1.5 diff --git a/ghc-connection.spec b/ghc-connection.spec index 468e9c3..e1ae605 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Simple and easy network connections API License: BSD @@ -118,6 +118,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 01 2019 Jens Petersen - 0.2.8-10 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.2.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 44ea8c3cdcda571c5cbbb85a8e7475685ae085b5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:16 +0800 Subject: [PATCH 16/30] BR prof for lib and static for executable --- ghc-connection.spec | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index e1ae605..cfd7b6d 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -18,24 +18,19 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-byteable-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-data-default-class-devel -BuildRequires: ghc-network-devel -BuildRequires: ghc-socks-devel -BuildRequires: ghc-tls-devel -BuildRequires: ghc-x509-devel -BuildRequires: ghc-x509-store-devel -BuildRequires: ghc-x509-system-devel -BuildRequires: ghc-x509-validation-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-byteable-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-class-prof +BuildRequires: ghc-network-prof +BuildRequires: ghc-socks-prof +BuildRequires: ghc-tls-prof +BuildRequires: ghc-x509-prof +BuildRequires: ghc-x509-store-prof +BuildRequires: ghc-x509-system-prof +BuildRequires: ghc-x509-validation-prof # End cabal-rpm deps %description @@ -50,6 +45,7 @@ the choice of SSL/TLS, and SOCKS. %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 ea484160b40e1077e1e6e4798697c903e5aa8a90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:28:18 +0000 Subject: [PATCH 17/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index cfd7b6d..dfebd4b 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.2.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Simple and easy network connections API License: BSD @@ -114,6 +114,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 0.2.8-10 - add doc and prof subpackages (cabal-rpm-1.0.0) From 33076293452a51650ae2a3589033095a17192c6c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:49:33 +0800 Subject: [PATCH 18/30] refresh to cabal-rpm-2.0.2 --- ghc-connection.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index dfebd4b..9417f7c 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -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. @@ -93,6 +95,16 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -105,6 +117,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 2572f3be059afaf757216678ec07f36aa04dfcc8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 10:54:26 +0800 Subject: [PATCH 19/30] update to 0.3.1 --- .gitignore | 1 + connection-0.2.8.cabal => connection-0.3.1.cabal | 16 ++++++++-------- ghc-connection.spec | 9 ++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) rename connection-0.2.8.cabal => connection-0.3.1.cabal (80%) diff --git a/.gitignore b/.gitignore index e55c3a9..ee534dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /connection-0.2.8.tar.gz +/connection-0.3.1.tar.gz diff --git a/connection-0.2.8.cabal b/connection-0.3.1.cabal similarity index 80% rename from connection-0.2.8.cabal rename to connection-0.3.1.cabal index 886e28e..f07e459 100644 --- a/connection-0.2.8.cabal +++ b/connection-0.3.1.cabal @@ -1,6 +1,6 @@ Name: connection -Version: 0.2.8 -x-revision: 2 +Version: 0.3.1 +x-revision: 1 Description: Simple network library for all your connection need. . @@ -18,19 +18,19 @@ Build-Type: Simple Category: Network stability: experimental Cabal-Version: >=1.6 -Homepage: http://github.com/vincenthz/hs-connection +Homepage: https://github.com/vincenthz/hs-connection extra-source-files: README.md CHANGELOG.md Library - Build-Depends: base >= 3 && < 5 + Build-Depends: base >= 4.8 && < 5 + , basement , bytestring - , byteable , containers , data-default-class - , network >= 2.3 && < 2.9 - , tls >= 1.3 - , socks >= 0.5.5 && < 0.6 + , network >= 2.6.3 + , tls >= 1.4 + , socks >= 0.6 , x509 >= 1.5 , x509-store >= 1.5 , x509-system >= 1.5 diff --git a/ghc-connection.spec b/ghc-connection.spec index 9417f7c..3d2c3e0 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.2.8 -Release: 11%{?dist} +Version: 0.3.1 +Release: 1%{?dist} Summary: Simple and easy network connections API License: BSD @@ -20,7 +20,7 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof -BuildRequires: ghc-byteable-prof +BuildRequires: ghc-basement-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-class-prof @@ -127,6 +127,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Feb 14 2020 Jens Petersen - 0.3.1-1 +- update to 0.3.1 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 17a85c2..a97b9c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (connection-0.2.8.tar.gz) = 59202159d8d9233d1786c75470892da1a577d7a82a8bb8f5c75d52ade7be227c5619fd6fdebf7f60d4e240b31e3b791df266c97787e3fe7814da380147f9c9c5 +SHA512 (connection-0.3.1.tar.gz) = 06da91d39e0d9a556a78da77a7ca31d520d5e7e8fd65509f82be926ad2c34282ef1f4d03aa6065c5834bc89417cf51b573f3cf4529fe3ead72eb1e80cc6d7a98 From 437e748cfcbda08172d5b50968e58d30cb129e3c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:45 +0800 Subject: [PATCH 20/30] refresh to cabal-rpm-2.0.5 --- ghc-connection.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 3d2c3e0..dfae41f 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection %global pkgver %{pkg_name}-%{version} From 2461a4d0de7e02b0c22256434656fa307a920345 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:54:22 +0800 Subject: [PATCH 21/30] refresh to cabal-rpm-2.0.6 --- ghc-connection.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index dfae41f..6f416ca 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -95,16 +95,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From f4da8d68690551bc39c1d7396737761c110872c5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:00:15 +0800 Subject: [PATCH 22/30] bump release --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 6f416ca..76aca25 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple and easy network connections API License: BSD @@ -117,6 +117,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Jul 17 2020 Jens Petersen - 0.3.1-2 +- refresh to cabal-rpm-2.0.6 + * Fri Feb 14 2020 Jens Petersen - 0.3.1-1 - update to 0.3.1 From 1f935372f79dbf926830348bc3f899e24b590550 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:57:19 +0000 Subject: [PATCH 23/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 76aca25..9cd599a 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple and easy network connections API License: BSD @@ -117,6 +117,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.3.1-2 - refresh to cabal-rpm-2.0.6 From d4438282e848dc52c4da77f03877a01b8586fe81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:01:16 +0000 Subject: [PATCH 24/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 9cd599a..ab0cdc7 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple and easy network connections API License: BSD @@ -117,6 +117,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3920199a1842fb4d0b1078b3f46d4561085d0c6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:28:29 +0000 Subject: [PATCH 25/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index ab0cdc7..a9af255 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple and easy network connections API License: BSD @@ -117,6 +117,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3c45f233754bfc2d7170b0714d6238431cdf776b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:10 +0800 Subject: [PATCH 26/30] refresh to cabal-rpm-2.0.9 --- ghc-connection.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index a9af255..8767a38 100644 --- a/ghc-connection.spec +++ b/ghc-connection.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 connection @@ -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 97541069fdc874929fdc6cc154b81346e7a80590 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 4 Aug 2021 22:29:11 +0800 Subject: [PATCH 27/30] revise .cabal --- connection-0.3.1.cabal | 88 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/connection-0.3.1.cabal b/connection-0.3.1.cabal index f07e459..2cd60ac 100644 --- a/connection-0.3.1.cabal +++ b/connection-0.3.1.cabal @@ -1,44 +1,44 @@ -Name: connection -Version: 0.3.1 -x-revision: 1 -Description: - Simple network library for all your connection need. - . - Features: Really simple to use, SSL/TLS, SOCKS. - . - This library provides a very simple api to create sockets - to a destination with the choice of SSL/TLS, and SOCKS. -License: BSD3 -License-file: LICENSE -Copyright: Vincent Hanquez -Author: Vincent Hanquez -Maintainer: Vincent Hanquez -Synopsis: Simple and easy network connections API -Build-Type: Simple -Category: Network -stability: experimental -Cabal-Version: >=1.6 -Homepage: https://github.com/vincenthz/hs-connection -extra-source-files: README.md - CHANGELOG.md - -Library - Build-Depends: base >= 4.8 && < 5 - , basement - , bytestring - , containers - , data-default-class - , network >= 2.6.3 - , tls >= 1.4 - , socks >= 0.6 - , x509 >= 1.5 - , x509-store >= 1.5 - , x509-system >= 1.5 - , x509-validation >= 1.5 - Exposed-modules: Network.Connection - Other-modules: Network.Connection.Types - ghc-options: -Wall - -source-repository head - type: git - location: https://github.com/vincenthz/hs-connection +Name: connection +Version: 0.3.1 +x-revision: 1 +Description: + Simple network library for all your connection need. + . + Features: Really simple to use, SSL/TLS, SOCKS. + . + This library provides a very simple api to create sockets + to a destination with the choice of SSL/TLS, and SOCKS. +License: BSD3 +License-file: LICENSE +Copyright: Vincent Hanquez +Author: Vincent Hanquez +Maintainer: Vincent Hanquez +Synopsis: Simple and easy network connections API +Build-Type: Simple +Category: Network +stability: experimental +Cabal-Version: >=1.6 +Homepage: https://github.com/vincenthz/hs-connection +extra-source-files: README.md + CHANGELOG.md + +Library + Build-Depends: base >= 4.8 && < 5 + , basement + , bytestring + , containers + , data-default-class + , network >= 2.6.3 + , tls >= 1.4 + , socks >= 0.6 + , x509 >= 1.5 + , x509-store >= 1.5 + , x509-system >= 1.5 + , x509-validation >= 1.5 + Exposed-modules: Network.Connection + Other-modules: Network.Connection.Types + ghc-options: -Wall + +source-repository head + type: git + location: https://github.com/vincenthz/hs-connection From 1eaae15645c3bab44274c7bc56e91912734fc99a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 10:41:30 +0800 Subject: [PATCH 28/30] bump release --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 8767a38..89fa7ba 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple and easy network connections API License: BSD @@ -118,6 +118,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Aug 06 2021 Jens Petersen - 0.3.1-6 +- rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From cf8bdbd386fab3cc5c5f940232bd1fa98ec5c7ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:41:10 +0000 Subject: [PATCH 29/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-connection.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-connection.spec b/ghc-connection.spec index 89fa7ba..53665c6 100644 --- a/ghc-connection.spec +++ b/ghc-connection.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Simple and easy network connections API License: BSD @@ -118,6 +118,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jens Petersen - 0.3.1-6 - rebuild From 42a5323be298d009aac53dac68c70327caf6902f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:31:20 +0300 Subject: [PATCH 30/30] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index a97b9c6..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (connection-0.3.1.tar.gz) = 06da91d39e0d9a556a78da77a7ca31d520d5e7e8fd65509f82be926ad2c34282ef1f4d03aa6065c5834bc89417cf51b573f3cf4529fe3ead72eb1e80cc6d7a98