From dc0366dab70065128091ccbaef17a0f65493cc2e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 May 2022 17:03:08 +0800 Subject: [PATCH] update to 3.1.2.7 --- .gitignore | 1 + ghc-network.spec | 13 +++++++----- network-3.1-unused-hsnet_inet_ntoa.patch | 27 ------------------------ sources | 2 +- 4 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 network-3.1-unused-hsnet_inet_ntoa.patch diff --git a/.gitignore b/.gitignore index 886a865..300b5f5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ network-2.2.1.7.tar.gz /network-2.6.3.6.tar.gz /network-2.8.0.1.tar.gz /network-3.1.1.1.tar.gz +/network-3.1.2.7.tar.gz diff --git a/ghc-network.spec b/ghc-network.spec index 483fa00..c3f0a6f 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -8,8 +8,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.1.1 -Release: 8%{?dist} +Version: 3.1.2.7 +Release: 1%{?dist} Summary: Low-level networking interface License: BSD @@ -17,7 +17,6 @@ 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 -Patch0: network-3.1-unused-hsnet_inet_ntoa.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -25,11 +24,13 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-directory-prof %if %{with tests} BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-directory-devel +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-hspec-discover-devel +BuildRequires: ghc-temporary-devel %endif # End cabal-rpm deps @@ -94,7 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%patch0 -p1 -b .orig %build @@ -137,6 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon May 02 2022 Jens Petersen - 3.1.2.7-1 +- https://hackage.haskell.org/package/network-3.1.2.7/changelog + * Tue Mar 08 2022 Jens Petersen - 3.1.1.1-8 - rebuild diff --git a/network-3.1-unused-hsnet_inet_ntoa.patch b/network-3.1-unused-hsnet_inet_ntoa.patch deleted file mode 100644 index 9f0a0c6..0000000 --- a/network-3.1-unused-hsnet_inet_ntoa.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- network-3.1.1.1/include/HsNet.h~ 2001-09-09 09:46:40.000000000 +0800 -+++ network-3.1.1.1/include/HsNet.h 2021-06-24 17:25:39.287773682 +0800 -@@ -86,24 +86,6 @@ - recvFd(int sock); - #endif /* _WIN32 */ - --INLINE char * --hsnet_inet_ntoa( --#if defined(_WIN32) -- u_long addr --#elif defined(HAVE_IN_ADDR_T) -- in_addr_t addr --#elif defined(HAVE_INTTYPES_H) -- u_int32_t addr --#else -- unsigned long addr --#endif -- ) --{ -- struct in_addr a; -- a.s_addr = addr; -- return inet_ntoa(a); --} -- - INLINE int - hsnet_getnameinfo(const struct sockaddr* a,socklen_t b, char* c, - # if defined(_WIN32) diff --git a/sources b/sources index 060c698..c491e78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-3.1.1.1.tar.gz) = caafd3c0730d0f6378230e0acdf285ca50480f02a44963c1f9ae9dc3d53cd496dd3171d7ff4bf79a1e072b85698d74f82d8075b999d5ba1d17ab1429c8094ca8 +SHA512 (network-3.1.2.7.tar.gz) = 2e4fa22656c015ca9b8fe7e0dfa824ae943010b0716e4c4cc5495d5b98a6cfecbe33180851f8eeea9d4b2f34beff13b6b1888d5b18b68822febc73c05410bc57