commit ghc-pcre-heavy for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-pcre-heavy for openSUSE:Factory
checked in at 2017-09-15 22:03:47
Comparing /work/SRC/openSUSE:Factory/ghc-pcre-heavy (Old)
and /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new (New)
Package is "ghc-pcre-heavy"
Fri Sep 15 22:03:47 2017 rev:5 rq:525139 version:1.0.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc-pcre-heavy/ghc-pcre-heavy.changes
2016-07-20 09:29:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new/ghc-pcre-heavy.changes
2017-09-15 22:03:48.335960018 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Other differences:
--
++ ghc-pcre-heavy.spec ++
--- /var/tmp/diff_new_pack.2RIlFs/_old 2017-09-15 22:03:49.403809554 +0200
+++ /var/tmp/diff_new_pack.2RIlFs/_new 2017-09-15 22:03:49.407808991 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-pcre-heavy
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,11 +23,10 @@
Release:0
Summary:A regexp library on top of pcre-light you can actually use
License:SUSE-Public-Domain
-Group: System/Libraries
-Url:https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+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
-# Begin cabal-rpm deps:
BuildRequires: ghc-base-compat-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-pcre-light-devel
@@ -35,12 +34,10 @@
BuildRequires: ghc-semigroups-devel
BuildRequires: ghc-string-conversions-devel
BuildRequires: ghc-template-haskell-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-Glob-devel
BuildRequires: ghc-doctest-devel
%endif
-# End cabal-rpm deps
%description
A regular expressions library that does not suck. Based on
@@ -51,7 +48,7 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -63,20 +60,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
@@ -85,11 +76,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
%doc UNLICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc README.md
%changelog
commit ghc-pcre-heavy for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-pcre-heavy for openSUSE:Factory
checked in at 2016-07-20 09:29:08
Comparing /work/SRC/openSUSE:Factory/ghc-pcre-heavy (Old)
and /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new (New)
Package is "ghc-pcre-heavy"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-pcre-heavy/ghc-pcre-heavy.changes
2016-03-26 15:26:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new/ghc-pcre-heavy.changes
2016-07-20 09:29:13.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:35:06 UTC 2016 - psim...@suse.com
+
+- Update to version 1.0.0.2 revision 0 with cabal2obs.
+
+---
Other differences:
--
++ ghc-pcre-heavy.spec ++
--- /var/tmp/diff_new_pack.5FEni5/_old 2016-07-20 09:29:14.0 +0200
+++ /var/tmp/diff_new_pack.5FEni5/_new 2016-07-20 09:29:14.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-pcre-heavy
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,31 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%global pkg_name pcre-heavy
+%global pkg_name pcre-heavy
%bcond_with tests
-
-Name: ghc-pcre-heavy
+Name: ghc-%{pkg_name}
Version:1.0.0.2
Release:0
Summary:A regexp library on top of pcre-light you can actually use
-Group: System/Libraries
-
License:SUSE-Public-Domain
+Group: System/Libraries
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-base-compat-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-pcre-light-devel
-BuildRequires: ghc-stringable-devel
-BuildRequires: ghc-string-conversions-devel
+BuildRequires: ghc-rpm-macros
BuildRequires: ghc-semigroups-devel
+BuildRequires: ghc-string-conversions-devel
BuildRequires: ghc-template-haskell-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-Glob-devel
BuildRequires: ghc-doctest-devel
@@ -53,19 +49,17 @@
Includes a QuasiQuoter for regexps that does compile time checking.
SEARCHES FOR MULTIPLE MATCHES! DOES REPLACEMENT!.
-
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
-
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -80,26 +74,22 @@
%check
%if %{with tests}
-%cabal test
+%{cabal} test
%endif
%post devel
%ghc_pkg_recache
-
%postun devel
%ghc_pkg_recache
-
%files -f %{name}.files
%defattr(-,root,root,-)
%doc UNLICENSE
-
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%doc README.md
-
%changelog
commit ghc-pcre-heavy for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-pcre-heavy for openSUSE:Factory
checked in at 2016-03-26 15:26:17
Comparing /work/SRC/openSUSE:Factory/ghc-pcre-heavy (Old)
and /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new (New)
Package is "ghc-pcre-heavy"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-pcre-heavy/ghc-pcre-heavy.changes
2016-01-08 15:22:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new/ghc-pcre-heavy.changes
2016-03-26 15:26:22.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 16 09:16:02 UTC 2016 - mimi...@gmail.com
+
+- update to 1.0.0.2
+
+---
Old:
pcre-heavy-1.0.0.1.tar.gz
New:
pcre-heavy-1.0.0.2.tar.gz
Other differences:
--
++ ghc-pcre-heavy.spec ++
--- /var/tmp/diff_new_pack.2uB27D/_old 2016-03-26 15:26:23.0 +0100
+++ /var/tmp/diff_new_pack.2uB27D/_new 2016-03-26 15:26:23.0 +0100
@@ -20,7 +20,7 @@
%bcond_with tests
Name: ghc-pcre-heavy
-Version:1.0.0.1
+Version:1.0.0.2
Release:0
Summary:A regexp library on top of pcre-light you can actually use
Group: System/Libraries
++ pcre-heavy-1.0.0.1.tar.gz -> pcre-heavy-1.0.0.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcre-heavy-1.0.0.1/library/Text/Regex/PCRE/Heavy.hs
new/pcre-heavy-1.0.0.2/library/Text/Regex/PCRE/Heavy.hs
--- old/pcre-heavy-1.0.0.1/library/Text/Regex/PCRE/Heavy.hs 2015-09-03
01:44:49.0 +0200
+++ new/pcre-heavy-1.0.0.2/library/Text/Regex/PCRE/Heavy.hs 2016-03-15
21:56:17.0 +0100
@@ -1,7 +1,10 @@
{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-unused-binds #-}
{-# LANGUAGE NoImplicitPrelude, UndecidableInstances, FlexibleInstances,
FlexibleContexts, BangPatterns #-}
{-# LANGUAGE TemplateHaskell, QuasiQuotes, UnicodeSyntax #-}
-{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE ForeignFunctionInterface, CPP #-}
+#if __GLASGOW_HASKELL__ < 710
+{-# LANGUAGE OverlappingInstances #-}
+#endif
-- | A usable regular expressions library on top of pcre-light.
module Text.Regex.PCRE.Heavy (
@@ -70,7 +73,7 @@
(≈) = (=~)
-- | Does raw PCRE matching (you probably shouldn't use this directly).
---
+--
-- >>> :set -XOverloadedStrings
-- >>> rawMatch [re|\w{2}|] "a a ab abc ba" 0 []
-- Just [(4,6)]
@@ -202,6 +205,9 @@
--
-- >>> gsub [re|bad|] "xxxbad" "this is bad, right? bad" :: String
-- "this is xxxbad, right? xxxbad"
+--
+-- >>> gsub [re|a|] "" "aaa" :: String
+-- ""
gsub ∷ (ConvertibleStrings SBS a, ConvertibleStrings a SBS, RegexReplacement
r) ⇒ Regex → r → a → a
gsub r t s = gsubO r [] t s
@@ -209,11 +215,15 @@
gsubO ∷ (ConvertibleStrings SBS a, ConvertibleStrings a SBS, RegexReplacement
r) ⇒ Regex → [PCREExecOption] → r → a → a
gsubO r opts t s = cs $ loop 0 str
where str = toSBS s
-loop offset acc =
- case rawSub r t acc offset opts of
+loop offset acc
+ | offset >= l = acc
+ | otherwise = case rawSub r t acc offset opts of
Just (result, newOffset) →
- if newOffset == offset then acc else loop newOffset result
+ if newOffset == offset && l == BS.length result
+ then acc
+ else loop newOffset result
_ → acc
+ where l = BS.length acc
-- | Splits the string using the given regex.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcre-heavy-1.0.0.1/pcre-heavy.cabal
new/pcre-heavy-1.0.0.2/pcre-heavy.cabal
--- old/pcre-heavy-1.0.0.1/pcre-heavy.cabal 2015-09-03 01:46:09.0
+0200
+++ new/pcre-heavy-1.0.0.2/pcre-heavy.cabal 2016-03-15 22:42:20.0
+0100
@@ -1,5 +1,5 @@
name:pcre-heavy
-version: 1.0.0.1
+version: 1.0.0.2
synopsis:A regexp library on top of pcre-light you can actually use.
description:
A regular expressions library that does not suck.
commit ghc-pcre-heavy for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-pcre-heavy for openSUSE:Factory
checked in at 2016-01-08 15:22:48
Comparing /work/SRC/openSUSE:Factory/ghc-pcre-heavy (Old)
and /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new (New)
Package is "ghc-pcre-heavy"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-pcre-heavy/ghc-pcre-heavy.changes
2015-11-26 17:02:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-pcre-heavy.new/ghc-pcre-heavy.changes
2016-01-08 15:22:49.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 16 17:25:44 UTC 2015 - mimi...@gmail.com
+
+- update to 1.0.0.1
+
+---
Old:
pcre-heavy-0.2.5.tar.gz
New:
pcre-heavy-1.0.0.1.tar.gz
Other differences:
--
++ ghc-pcre-heavy.spec ++
--- /var/tmp/diff_new_pack.FaY1KW/_old 2016-01-08 15:22:50.0 +0100
+++ /var/tmp/diff_new_pack.FaY1KW/_new 2016-01-08 15:22:50.0 +0100
@@ -20,7 +20,7 @@
%bcond_with tests
Name: ghc-pcre-heavy
-Version:0.2.5
+Version:1.0.0.1
Release:0
Summary:A regexp library on top of pcre-light you can actually use
Group: System/Libraries
@@ -33,9 +33,12 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
+BuildRequires: ghc-base-compat-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-pcre-light-devel
BuildRequires: ghc-stringable-devel
+BuildRequires: ghc-string-conversions-devel
+BuildRequires: ghc-semigroups-devel
BuildRequires: ghc-template-haskell-devel
%if %{with tests}
BuildRequires: ghc-Glob-devel
++ pcre-heavy-0.2.5.tar.gz -> pcre-heavy-1.0.0.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcre-heavy-0.2.5/README.md
new/pcre-heavy-1.0.0.1/README.md
--- old/pcre-heavy-0.2.5/README.md 2015-08-23 09:54:27.0 +0200
+++ new/pcre-heavy-1.0.0.1/README.md2015-09-02 22:23:43.0 +0200
@@ -2,19 +2,20 @@
*Finally!* A Haskell regular expressions library that does not suck.
-- based on [pcre-light], none of that regex-compat-pluggable-backend stuff
-- takes and returns [Stringables] everywhere, use ANY STRING TYPE (String,
ByteString, LByteString, Text, LText, FilePath) -- but you need a bit more type
annotations than usual
+- based on [pcre-light], none of that regex-base complicated pluggable-backend
stuff
+- takes and returns [ConvertibleStrings] everywhere, use ANY STRING TYPE
(String, ByteString, Lazy ByteString, Text, Lazy Text) -- but you need a bit
more type annotations (or [ClassyPrelude]'s `asText`, `asString`, etc.) if you
use `OverloadedStrings` which you probably can't live without
- a QuasiQuoter for regexps that does compile time checking (BTW, [vim2hs] has
correct syntax highlighting for that!)
- **SEARCHES FOR MULTIPLE MATCHES! DOES REPLACEMENT!**
[pcre-light]: https://hackage.haskell.org/package/pcre-light
-[Stringables]: https://hackage.haskell.org/package/stringable
+[ConvertibleStrings]: https://hackage.haskell.org/package/string-conversions
+[ClassyPrelude]: https://hackage.haskell.org/package/classy-prelude
[vim2hs]: https://github.com/dag/vim2hs#quasi-quoting
## Usage
```haskell
-{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE QuasiQuotes, FlexibleContexts #-}
import Text.Regex.PCRE.Heavy
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pcre-heavy-0.2.5/library/Text/Regex/PCRE/Heavy.hs
new/pcre-heavy-1.0.0.1/library/Text/Regex/PCRE/Heavy.hs
--- old/pcre-heavy-0.2.5/library/Text/Regex/PCRE/Heavy.hs 2015-08-23
17:30:13.0 +0200
+++ new/pcre-heavy-1.0.0.1/library/Text/Regex/PCRE/Heavy.hs 2015-09-03
01:44:49.0 +0200
@@ -1,9 +1,7 @@
{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-unused-binds #-}
-{-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE FlexibleInstances, BangPatterns #-}
-{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
+{-# LANGUAGE NoImplicitPrelude, UndecidableInstances, FlexibleInstances,
FlexibleContexts, BangPatterns #-}
+{-# LANGUAGE TemplateHaskell, QuasiQuotes, UnicodeSyntax #-}
{-# LANGUAGE ForeignFunctionInterface #-}
-{-# LANGUAGE UnicodeSyntax, CPP #-}
-- | A usable regular expressions library on top of pcre-light.
module Text.Regex.PCRE.Heavy (
@@ -34,9 +32,7 @@
, rawSub
) where
-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative ((<$>))
-#endif
+import Prelude.Compat
import Language.Haskell.TH hiding (match)
import Language.Haskell.TH.Quote
import Language.Haskell.TH.Syntax
@@ -44,33 +40,33 @@
import Text.Regex.PCRE.Light.Base
import
