From f6f3205b8a270f0b8097faa3ea64c0815f555ef0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:45:02 +0800 Subject: [PATCH] update to 1.3.1.0 --- .gitignore | 1 + ghc-regex-tdfa.spec | 34 ++++++++- regex-tdfa-1.3.1.0.cabal | 158 +++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 190 insertions(+), 5 deletions(-) create mode 100644 regex-tdfa-1.3.1.0.cabal diff --git a/.gitignore b/.gitignore index 43cd685..dd679f1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /regex-tdfa-1.2.2.tar.gz /regex-tdfa-1.2.3.1.tar.gz /regex-tdfa-1.2.3.2.tar.gz +/regex-tdfa-1.3.1.0.tar.gz diff --git a/ghc-regex-tdfa.spec b/ghc-regex-tdfa.spec index 90a543f..6aa790d 100644 --- a/ghc-regex-tdfa.spec +++ b/ghc-regex-tdfa.spec @@ -4,15 +4,18 @@ %global pkg_name regex-tdfa %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 1.2.3.2 -Release: 2%{?dist} -Summary: Haskell tagged DFA regular expression library +Version: 1.3.1.0 +Release: 1%{?dist} +Summary: Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base) 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: @@ -25,10 +28,24 @@ BuildRequires: ghc-containers-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-regex-base-prof +BuildRequires: ghc-text-prof +%if %{with tests} +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-utf8-string-devel +%endif # End cabal-rpm deps %description -A new all Haskell "tagged" DFA regex engine, inspired by libtre. +This package provides a pure Haskell "Tagged" DFA regex engine for +. This implementation was +inspired by the algorithm (and Master's thesis) behind the regular expression +library known as . + +Please consult the "Text.Regex.TDFA" module for API documentation including a +tutorial with usage examples; see also + for general information about +regular expression support in Haskell. %package devel @@ -68,6 +85,7 @@ 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 @@ -80,9 +98,14 @@ This package provides the Haskell %{pkg_name} profiling library. %install # Begin cabal-rpm install %ghc_lib_install +chmod a-x CHANGELOG.md # End cabal-rpm install +%check +%cabal_test + + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -115,6 +138,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Jun 10 2020 Jens Petersen - 1.3.1.0-1 +- update to 1.3.1.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/regex-tdfa-1.3.1.0.cabal b/regex-tdfa-1.3.1.0.cabal new file mode 100644 index 0000000..5ae8884 --- /dev/null +++ b/regex-tdfa-1.3.1.0.cabal @@ -0,0 +1,158 @@ +cabal-version: 1.12 +name: regex-tdfa +version: 1.3.1.0 +x-revision: 1 + +build-Type: Simple +license: BSD3 +license-file: LICENSE +copyright: Copyright (c) 2007-2009, Christopher Kuklewicz +author: Christopher Kuklewicz +maintainer: hvr@gnu.org +bug-reports: https://github.com/hvr/regex-tdfa/issues +tested-with: GHC==7.4.2 + , GHC==7.6.3 + , GHC==7.8.4 + , GHC==7.10.3 + , GHC==8.0.2 + , GHC==8.2.2 + , GHC==8.4.4 + , GHC==8.6.5 + , GHC==8.8.3 + , GHC==8.10.1 + +category: Text +synopsis: Pure Haskell Tagged DFA Backend for "Text.Regex" (regex-base) +description: + This package provides a pure Haskell \"Tagged\" DFA regex engine for . This implementation was inspired by the algorithm (and Master's thesis) behind the regular expression library known as . + . + Please consult the "Text.Regex.TDFA" module for API documentation including a tutorial with usage examples; + see also for general information about regular expression support in Haskell. + +extra-source-files: + CHANGELOG.md + test/cases/*.txt + +source-repository head + type: git + location: https://github.com/hvr/regex-tdfa.git + +flag force-O2 + default: False + manual: True + description: + Force building @regex-tdfa@ with \"@ghc-options: -O2@\". + . + __NOTE__: This flag is mostly provided for legacy use-cases. Nowadays you can conveniently control optimization levels on a per-package granularity via @cabal.project@ files; see for more details. + +library + hs-source-dirs: lib + + exposed-modules: Data.IntMap.CharMap2 + Data.IntMap.EnumMap2 + Data.IntSet.EnumSet2 + Text.Regex.TDFA + Text.Regex.TDFA.ByteString + Text.Regex.TDFA.ByteString.Lazy + Text.Regex.TDFA.Common + Text.Regex.TDFA.CorePattern + Text.Regex.TDFA.IntArrTrieSet + Text.Regex.TDFA.NewDFA.Engine + Text.Regex.TDFA.NewDFA.Engine_FA + Text.Regex.TDFA.NewDFA.Engine_NC + Text.Regex.TDFA.NewDFA.Engine_NC_FA + Text.Regex.TDFA.NewDFA.Tester + Text.Regex.TDFA.NewDFA.Uncons + Text.Regex.TDFA.NewDFA.MakeTest + Text.Regex.TDFA.Pattern + Text.Regex.TDFA.ReadRegex + Text.Regex.TDFA.Sequence + Text.Regex.TDFA.String + Text.Regex.TDFA.TDFA + Text.Regex.TDFA.TNFA + Text.Regex.TDFA.Text + Text.Regex.TDFA.Text.Lazy + + other-modules: Paths_regex_tdfa + + -- Support Semigroup instances uniformly + -- + -- See also + -- https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid#RecommendedVariant + -- + -- NB: This is the same logic `parsec.cabal` uses, so this doesn't + -- add any new dependency that isn't already incurred by + -- `regex-tdfa`'s transitive deps + if !impl(ghc >= 8.0) + build-depends: fail == 4.9.* + , semigroups == 0.18.* || == 0.19.* + build-depends: array >= 0.4 && < 0.6 + , base >= 4.5 && < 4.15 + , bytestring >= 0.9.2 && < 0.11 + , containers >= 0.4.2 && < 0.7 + , mtl >= 2.1.3 && < 2.3 + , parsec == 3.1.* + , regex-base == 0.94.* + , text >= 1.2.3 && < 1.3 + + default-language: Haskell2010 + default-extensions: BangPatterns + ExistentialQuantification + FlexibleContexts + FlexibleInstances + ForeignFunctionInterface + FunctionalDependencies + MagicHash + MultiParamTypeClasses + NoMonoPatBinds + NondecreasingIndentation + RecursiveDo + TypeOperators + TypeSynonymInstances + UnboxedTuples + UnliftedFFITypes + other-extensions: CPP + + ghc-options: -Wall -funbox-strict-fields -fspec-constr-count=10 -fno-warn-orphans + + if flag(force-O2) + ghc-options: -O2 + + +test-suite regex-tdfa-unittest + type: exitcode-stdio-1.0 + + hs-source-dirs: test + main-is: Main.hs + + -- intra-package dependency + build-depends: regex-tdfa + + -- dependencies whose version constraints are inherited via intra-package 'regex-tdfa' dependency + if !impl(ghc >= 8.0) + build-depends: fail + , semigroups + build-depends: array + , base + , bytestring + , containers + , filepath + , mtl + , regex-base + , text + + -- component-specific dependencies not inherited via 'regex-tdfa' + , directory >= 1.1.0 && < 1.4 + , filepath >= 1.3.0 && < 1.5 + , utf8-string >= 1.0.1 && < 1.1 + + default-language: Haskell2010 + default-extensions: FlexibleInstances + FlexibleContexts + Rank2Types + other-extensions: GeneralizedNewtypeDeriving + + ghc-options: -Wall -funbox-strict-fields + + if flag(force-O2) + ghc-options: -O2 diff --git a/sources b/sources index bbaaa0a..e029d1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (regex-tdfa-1.2.3.2.tar.gz) = 2a2e737ca9f0170688a6b39378c461ae5aa2540c28c7b58a3c1785a343fa7829dcecf3948d915e17a5d647b70a5b369dd1db586412677fe7e5b8f9cfbde11960 +SHA512 (regex-tdfa-1.3.1.0.tar.gz) = becac929003ea2c1a8fe1e890a53d3cb914eeb02090a23d014120d04ee144e24c2c7bdfaadd58a2dd70ed49df1e0059a3f8a94faa4ce0a6efd533ee6019c951f