From 50ad453f5ea7d33cb3cde9303473625080e6ec32 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 4 Sep 2017 18:13:37 +0000 Subject: [PATCH 01/28] 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..0754578 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-socks + +The ghc-socks package \ No newline at end of file From 1f1bfb761a5c99da4afac9fc9f96e8b7d8a92c5b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 4 Sep 2017 18:59:45 -0400 Subject: [PATCH 02/28] Initial import (#1487898). --- .gitignore | 1 + README.md | 3 -- ghc-socks.spec | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-socks.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1c33d48 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/socks-0.5.5.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0754578..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-socks - -The ghc-socks package \ No newline at end of file diff --git a/ghc-socks.spec b/ghc-socks.spec new file mode 100644 index 0000000..3cb7b1e --- /dev/null +++ b/ghc-socks.spec @@ -0,0 +1,92 @@ +# generated by cabal-rpm-0.10.0 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name socks + +Name: ghc-%{pkg_name} +Version: 0.5.5 +Release: 1.git.0.d4ff3d0%{?dist} +Summary: Socks proxy (version 5) implementation + +License: BSD +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 +# Begin cabal-rpm deps: +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cereal-devel +BuildRequires: ghc-network-devel +# End cabal-rpm deps + +%description +Socks proxy (version 5) implementation. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel.files +%doc Example.hs README.md + + +%changelog +* Sat Jul 22 2017 Elliott Sales de Andrade 0.5.5-1 +- Update to latest version. +- Remove extra files from build. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.5.4-6 +- Re-add dist tag to release numbers. + +* Mon Jul 17 2017 Elliott Sales de Andrade 0.5.4-5 +- Bump for Fedora 26. + +* Thu Dec 15 2016 Elliott Sales de Andrade - 0.5.4-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.5.4-3 +- Bump to rebuild against new dependencies + +* Fri Apr 29 2016 Elliott Sales de Andrade - 0.5.4-2 +- Bump release to rebuild against dependencies + +* Sun Aug 23 2015 Ben Boeckel - 0.5.4-1 +- initial package + +* Sun Aug 23 2015 Fedora Haskell SIG - 0.5.4-1 +- spec file generated by cabal-rpm-0.9.6 diff --git a/sources b/sources new file mode 100644 index 0000000..9589440 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (socks-0.5.5.tar.gz) = cc811d0175d9a20c0aaec2eb593145908d25792f2ad5fb6b129564922bf8b64c3cda6b1424ac7e8ad2abfd1bcde7ece7ab717550266b75a5b360b4b729a768f5 From a04049b4da76cb5a4b8008761805c83e1df76fc9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 4 Sep 2017 19:00:13 -0400 Subject: [PATCH 03/28] Fix release number. --- ghc-socks.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 3cb7b1e..6a8957a 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} Version: 0.5.5 -Release: 1.git.0.d4ff3d0%{?dist} +Release: 1%{?dist} Summary: Socks proxy (version 5) implementation License: BSD From 0df7fb3a90f55fe86d0a80c8cc60edb91e2586a8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:01 +0100 Subject: [PATCH 04/28] refresh to cabal-rpm-0.12.1 --- ghc-socks.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 6a8957a..8afd357 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -1,7 +1,8 @@ -# generated by cabal-rpm-0.10.0 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name socks +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} Version: 0.5.5 @@ -10,7 +11,7 @@ Summary: Socks proxy (version 5) implementation 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 @@ -27,9 +28,12 @@ Socks proxy (version 5) implementation. %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 @@ -37,7 +41,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -48,6 +52,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 7d04457ef7c510c496ef828eb80b42072fb25b2a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:53:34 +0100 Subject: [PATCH 05/28] update to 0.5.6 --- .gitignore | 1 + ghc-socks.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c33d48..6424fda 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /socks-0.5.5.tar.gz +/socks-0.5.6.tar.gz diff --git a/ghc-socks.spec b/ghc-socks.spec index 8afd357..2a26d86 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -5,9 +5,9 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} -Summary: Socks proxy (version 5) implementation +Summary: Socks proxy (ver 5) License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} @@ -75,6 +75,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jan 24 2018 Jens Petersen - 0.5.6-1 +- update to 0.5.6 + * Sat Jul 22 2017 Elliott Sales de Andrade 0.5.5-1 - Update to latest version. - Remove extra files from build. diff --git a/sources b/sources index 9589440..26b24e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (socks-0.5.5.tar.gz) = cc811d0175d9a20c0aaec2eb593145908d25792f2ad5fb6b129564922bf8b64c3cda6b1424ac7e8ad2abfd1bcde7ece7ab717550266b75a5b360b4b729a768f5 +SHA512 (socks-0.5.6.tar.gz) = 1e7210157146783242e8db38f0956fac520c9e125954f4b00e95eee4a272d9893dcf9bb408363dfe59c7aa5f0f1e4bd4556fe102157cf6b71bab5a22a96a27d8 From cc28b0d08c417c6245de4f02920acf5329af2420 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:28 +0900 Subject: [PATCH 06/28] drop ldconfig scriptlets --- ghc-socks.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 2a26d86..b1b003e 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -52,12 +52,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 1f7b18d0b3d48dffb49fd96601eef1263c500416 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:10:02 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index b1b003e..cc132f1 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.5.6-1 - update to 0.5.6 From 52015265f9a19ce0bf94bf285a70fbc00229d09d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:08:28 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index cc132f1..e537451 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.5.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b72de5d3e821ea23fd3911b23cbc1877ebf9bfcd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 29 Jul 2018 01:06:10 +0900 Subject: [PATCH 09/28] rebuild --- ghc-socks.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index e537451..14b8126 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sat Jul 28 2018 Jens Petersen - 0.5.6-4 +- rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.5.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b4681bde099bc4e809a34b9c8732d8347bc9cf58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:01:31 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 14b8126..5e27ccb 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -69,6 +69,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.5.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.5.6-4 - rebuild From a6adb4d5536e5b296426260cfd18f0c9d0140fb4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:11 +0800 Subject: [PATCH 11/28] refresh to cabal-rpm-0.13 --- ghc-socks.spec | 21 ++++++++++++++++++--- socks-0.5.6.cabal | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 socks-0.5.6.cabal diff --git a/ghc-socks.spec b/ghc-socks.spec index 5e27ccb..dd4992e 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -6,16 +6,19 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Socks proxy (ver 5) 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-bytestring-devel BuildRequires: ghc-cereal-devel BuildRequires: ghc-network-devel @@ -41,15 +44,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 @@ -61,7 +71,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 @@ -69,6 +81,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.5.6-6 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.5.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/socks-0.5.6.cabal b/socks-0.5.6.cabal new file mode 100644 index 0000000..6b2e5e6 --- /dev/null +++ b/socks-0.5.6.cabal @@ -0,0 +1,35 @@ +Name: socks +Version: 0.5.6 +x-revision: 1 +Synopsis: Socks proxy (ver 5) +Description: Socks proxy (version 5) implementation. +License: BSD3 +License-file: LICENSE +Copyright: Vincent Hanquez +Author: Vincent Hanquez +Maintainer: Vincent Hanquez +Build-Type: Simple +Category: Network +stability: experimental +Cabal-Version: >=1.18 +Homepage: http://github.com/vincenthz/hs-socks +extra-doc-files: README.md, Example.hs + +Library + Build-Depends: base >= 3 && < 5 + , bytestring + , cereal >= 0.3.1 + , network >= 2.4 && < 2.9 + Exposed-modules: Network.Socks5 + Network.Socks5.Lowlevel + Network.Socks5.Types + Other-modules: Network.Socks5.Wire + Network.Socks5.Conf + Network.Socks5.Command + Network.Socks5.Parse + ghc-options: -Wall -fno-warn-missing-signatures -fwarn-tabs + default-language: Haskell2010 + +source-repository head + type: git + location: git://github.com/vincenthz/hs-socks From 92a91528768935f67b4e5e39aa19496a13e36b6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:01:14 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index dd4992e..d2f3074 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -81,6 +81,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.5.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.5.6-6 - refresh to cabal-rpm-0.13 From fa6b9e9f235bd02ea95e1969232ed0af82274e74 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:25:56 +0000 Subject: [PATCH 13/28] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-socks.spec | 53 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index d2f3074..ac79666 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -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-bytestring-devel BuildRequires: ghc-cereal-devel @@ -31,11 +37,8 @@ Socks proxy (version 5) implementation. %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} @@ -43,6 +46,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} @@ -62,14 +84,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 @@ -80,7 +94,20 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %doc Example.hs README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Fri Aug 02 2019 Jens Petersen - 0.5.6-8 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.5.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9e019b668cc3e87b079080824dc290809340afe1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:31:55 +0800 Subject: [PATCH 14/28] BR prof for lib and static for executable --- ghc-socks.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index ac79666..43063b7 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -18,16 +18,11 @@ 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-bytestring-devel -BuildRequires: ghc-cereal-devel -BuildRequires: ghc-network-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cereal-prof +BuildRequires: ghc-network-prof # End cabal-rpm deps %description @@ -37,6 +32,7 @@ Socks proxy (version 5) implementation. %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 3b6988ea45275b5298a7386183adcaa2911c6793 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:24:18 +0000 Subject: [PATCH 15/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 43063b7..954798f 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.5.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -101,6 +101,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.5.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 0.5.6-8 - add doc and prof subpackages (cabal-rpm-1.0.0) From e6893cca5a593473cb1285915777b0a396788a16 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:52:05 +0800 Subject: [PATCH 16/28] refresh to cabal-rpm-2.0.2 --- ghc-socks.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 954798f..87a8fc3 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -45,6 +45,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. @@ -55,6 +56,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. @@ -80,6 +82,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 @@ -92,6 +104,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 62aabcba61fb4f4c4dda28bcadc13c9a49ebf02b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:02:00 +0800 Subject: [PATCH 17/28] update to 0.6.1 --- .gitignore | 1 + ghc-socks.spec | 10 ++++++---- socks-0.5.6.cabal | 35 ----------------------------------- sources | 2 +- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 socks-0.5.6.cabal diff --git a/.gitignore b/.gitignore index 6424fda..4a2142e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /socks-0.5.5.tar.gz /socks-0.5.6.tar.gz +/socks-0.6.1.tar.gz diff --git a/ghc-socks.spec b/ghc-socks.spec index 87a8fc3..d5babdf 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -5,21 +5,21 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.5.6 -Release: 9%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: Socks proxy (ver 5) 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 BuildRequires: ghc-base-prof +BuildRequires: ghc-basement-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-cereal-prof BuildRequires: ghc-network-prof @@ -66,7 +66,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -114,6 +113,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Feb 14 2020 Jens Petersen - 0.6.1-1 +- update to 0.6.1 + * Tue Jan 28 2020 Fedora Release Engineering - 0.5.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/socks-0.5.6.cabal b/socks-0.5.6.cabal deleted file mode 100644 index 6b2e5e6..0000000 --- a/socks-0.5.6.cabal +++ /dev/null @@ -1,35 +0,0 @@ -Name: socks -Version: 0.5.6 -x-revision: 1 -Synopsis: Socks proxy (ver 5) -Description: Socks proxy (version 5) implementation. -License: BSD3 -License-file: LICENSE -Copyright: Vincent Hanquez -Author: Vincent Hanquez -Maintainer: Vincent Hanquez -Build-Type: Simple -Category: Network -stability: experimental -Cabal-Version: >=1.18 -Homepage: http://github.com/vincenthz/hs-socks -extra-doc-files: README.md, Example.hs - -Library - Build-Depends: base >= 3 && < 5 - , bytestring - , cereal >= 0.3.1 - , network >= 2.4 && < 2.9 - Exposed-modules: Network.Socks5 - Network.Socks5.Lowlevel - Network.Socks5.Types - Other-modules: Network.Socks5.Wire - Network.Socks5.Conf - Network.Socks5.Command - Network.Socks5.Parse - ghc-options: -Wall -fno-warn-missing-signatures -fwarn-tabs - default-language: Haskell2010 - -source-repository head - type: git - location: git://github.com/vincenthz/hs-socks diff --git a/sources b/sources index 26b24e3..78c26a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (socks-0.5.6.tar.gz) = 1e7210157146783242e8db38f0956fac520c9e125954f4b00e95eee4a272d9893dcf9bb408363dfe59c7aa5f0f1e4bd4556fe102157cf6b71bab5a22a96a27d8 +SHA512 (socks-0.6.1.tar.gz) = ff56c1b356491e36888f9c1b4187fbd0d00485692960a27ec2f03dbd3c3fb961869d99da1f7a301578ab07df30739d8a0d4ae3c7559c83d0e2493d5de158175b From eb4cf3f37ba5e30e07df3e5a882754adefa948c9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:20 +0800 Subject: [PATCH 18/28] refresh to cabal-rpm-2.0.5 --- ghc-socks.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index d5babdf..caff793 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks %global pkgver %{pkg_name}-%{version} From 3f983e84df2e6ae4d63dcf88b32a2ff6a8f02abc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:56:58 +0800 Subject: [PATCH 19/28] refresh to cabal-rpm-2.0.6 --- ghc-socks.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index caff793..2171168 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -81,16 +81,6 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 6343895a3fdfa47be7406e7fec2c5aaeea3d35b9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:38:36 +0800 Subject: [PATCH 20/28] bump release --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 2171168..bfdae42 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -103,6 +103,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Jul 17 2020 Jens Petersen - 0.6.1-2 +- refresh to cabal-rpm-2.0.6 + * Fri Feb 14 2020 Jens Petersen - 0.6.1-1 - update to 0.6.1 From cf64c9d7fac6ff77fe2502b204f659c016501475 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:40:50 +0000 Subject: [PATCH 21/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index bfdae42..ceb7b71 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -103,6 +103,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.6.1-2 - refresh to cabal-rpm-2.0.6 From 70b50c089f4bcbef78c2029760cf8399d09bb481 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:30:12 +0000 Subject: [PATCH 22/28] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index ceb7b71..7a6d682 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -103,6 +103,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.6.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 78de584374695e887ce7299f17fa9d55fca7f782 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:44:44 +0000 Subject: [PATCH 23/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 7a6d682..090f0c4 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -103,6 +103,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.6.1-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a886b32ad749dde1b7e0d3527dde24ef7227458c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:16:11 +0000 Subject: [PATCH 24/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 090f0c4..6d07e99 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -103,6 +103,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9ea764664661c47c8c9e60bae059da72f2c0d302 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:13 +0800 Subject: [PATCH 25/28] refresh to cabal-rpm-2.0.9 --- ghc-socks.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index 6d07e99..a9e1ec4 100644 --- a/ghc-socks.spec +++ b/ghc-socks.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 socks @@ -46,6 +46,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 5d0c786f54132e795480b35b2d49c96a61ef21df Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Aug 2021 13:07:36 +0800 Subject: [PATCH 26/28] bump release --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index a9e1ec4..d61d661 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -104,6 +104,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Aug 06 2021 Jens Petersen - 0.6.1-7 +- rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4ba09c255456c327945334a25f081593e03507bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:33:39 +0000 Subject: [PATCH 27/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-socks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-socks.spec b/ghc-socks.spec index d61d661..74da74d 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 0.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Socks proxy (ver 5) License: BSD @@ -104,6 +104,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jens Petersen - 0.6.1-7 - rebuild From 2348dc33a5a6063572a2efb1a47af9f53d5abc80 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:56:12 +0300 Subject: [PATCH 28/28] 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 78c26a2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (socks-0.6.1.tar.gz) = ff56c1b356491e36888f9c1b4187fbd0d00485692960a27ec2f03dbd3c3fb961869d99da1f7a301578ab07df30739d8a0d4ae3c7559c83d0e2493d5de158175b