From d319d5b605ecc7fdef616ff0e674f7bde2af0448 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 11:48:01 +0800 Subject: [PATCH] update to 2.6.2.0 --- .gitignore | 1 + ghc-network-uri.spec | 9 +++- ...2.6.1.0.cabal => network-uri-2.6.2.0.cabal | 42 +++++++++++++++++-- sources | 2 +- 4 files changed, 47 insertions(+), 7 deletions(-) rename network-uri-2.6.1.0.cabal => network-uri-2.6.2.0.cabal (75%) diff --git a/.gitignore b/.gitignore index 6effb5b..af8ac08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /network-uri-2.6.0.3.tar.gz /network-uri-2.6.1.0.tar.gz +/network-uri-2.6.2.0.tar.gz diff --git a/ghc-network-uri.spec b/ghc-network-uri.spec index bbfc56f..9a9c8d2 100644 --- a/ghc-network-uri.spec +++ b/ghc-network-uri.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 2.6.1.0 -Release: 15%{?dist} +Version: 2.6.2.0 +Release: 1%{?dist} Summary: URI manipulation License: BSD @@ -22,6 +22,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-parsec-prof +BuildRequires: ghc-template-haskell-prof # End cabal-rpm deps %description @@ -98,6 +99,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%doc CHANGELOG.md README.md %if %{with haddock} @@ -112,6 +114,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Feb 14 2020 Jens Petersen - 2.6.2.0-1 +- update to 2.6.2.0 + * Tue Jan 28 2020 Fedora Release Engineering - 2.6.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/network-uri-2.6.1.0.cabal b/network-uri-2.6.2.0.cabal similarity index 75% rename from network-uri-2.6.1.0.cabal rename to network-uri-2.6.2.0.cabal index 475fc25..d2a6c22 100644 --- a/network-uri-2.6.1.0.cabal +++ b/network-uri-2.6.2.0.cabal @@ -1,10 +1,10 @@ name: network-uri -version: 2.6.1.0 +version: 2.6.2.0 x-revision: 1 synopsis: URI manipulation description: This package provides facilities for parsing and unparsing URIs, and creating - and resolving relative URI references, closely following the URI spec, + and resolving relative URI references, closely following the URI spec, . . == Backward-compatibility @@ -12,7 +12,7 @@ description: In @network-2.6@ the "Network.URI" module was split off from the @network@ package into this package. If you're using the "Network.URI" module you can be backward compatible and automatically get it from - the right package by using the + the right package by using the in your @.cabal@ file's build-depends (along with dependencies for both @network-uri@ and @network@): @@ -41,20 +41,39 @@ homepage: https://github.com/haskell/network-uri bug-reports: https://github.com/haskell/network-uri/issues license: BSD3 license-file: LICENSE +extra-source-files: README.md, CHANGELOG.md maintainer: ezra@ezrakilty.net category: Network build-type: Simple cabal-version: >=1.10 +tested-with: + GHC ==8.10.1 + || ==8.8.2 + || ==8.6.5 + || ==8.4.4 + || ==8.2.2 + || ==8.0.2 + || ==7.10.3 + || ==7.8.4 + || ==7.6.3 + || ==7.4.2 + || ==7.2.2 + || ==7.0.2 library exposed-modules: Network.URI + Network.URI.Lens + Network.URI.Static build-depends: base >= 3 && < 5, deepseq >= 1.1 && < 1.5, parsec >= 3.0 && < 3.2 + build-depends: template-haskell <2.16 default-extensions: CPP, DeriveDataTypeable - if impl(ghc >= 7.6) + if impl(ghc < 7.6) + build-depends: ghc-prim + if impl(ghc >= 7.2) default-extensions: DeriveGeneric ghc-options: -Wall -fwarn-tabs default-language: Haskell98 @@ -75,6 +94,21 @@ test-suite uri ghc-options: -Wall -fwarn-tabs default-language: Haskell98 +test-suite uri-bench + hs-source-dirs: tests + main-is: uri-bench.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + HUnit, + network-uri, + criterion, + deepseq + + ghc-options: -Wall -fwarn-tabs + default-language: Haskell98 + source-repository head type: git location: git://github.com/haskell/network-uri.git diff --git a/sources b/sources index b4783ea..0109e40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6ed1e8314a9b1674a3d118d9019a229 network-uri-2.6.1.0.tar.gz +SHA512 (network-uri-2.6.2.0.tar.gz) = 66c67eac386da617f866ad0684a7262d009f67be0ccd0c4f20ca2de38219e00b11de1fef4c3769957b1412dd42b949cc01a8edc40564a31d3735c12696d648b1