Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-attoparsec-iso8601 for
openSUSE:Factory checked in at 2021-01-20 18:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601 (Old)
and /work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-attoparsec-iso8601"
Wed Jan 20 18:24:17 2021 rev:11 rq:862323 version:1.0.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-attoparsec-iso8601/ghc-attoparsec-iso8601.changes
2020-12-22 11:35:06.321236981 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-attoparsec-iso8601.new.28504/ghc-attoparsec-iso8601.changes
2021-01-20 18:25:01.439380477 +0100
@@ -1,0 +2,6 @@
+Mon Jan 4 11:05:49 UTC 2021 - [email protected]
+
+- Update attoparsec-iso8601 to version 1.0.2.0.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
attoparsec-iso8601-1.0.1.0.tar.gz
attoparsec-iso8601.cabal
New:
----
attoparsec-iso8601-1.0.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-attoparsec-iso8601.spec ++++++
--- /var/tmp/diff_new_pack.AEQFaq/_old 2021-01-20 18:25:02.495381507 +0100
+++ /var/tmp/diff_new_pack.AEQFaq/_new 2021-01-20 18:25:02.495381507 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-attoparsec-iso8601
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,18 @@
%global pkg_name attoparsec-iso8601
Name: ghc-%{pkg_name}
-Version: 1.0.1.0
+Version: 1.0.2.0
Release: 0
Summary: Parsing of ISO 8601 dates, originally from aeson
License: BSD-3-Clause
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-attoparsec-devel
-BuildRequires: ghc-base-compat-devel
+BuildRequires: ghc-base-compat-batteries-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-text-devel
+BuildRequires: ghc-time-compat-devel
BuildRequires: ghc-time-devel
ExcludeArch: %{ix86}
@@ -49,7 +49,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ attoparsec-iso8601-1.0.1.0.tar.gz -> attoparsec-iso8601-1.0.2.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time/Internal.hs
new/attoparsec-iso8601-1.0.2.0/Data/Attoparsec/Time/Internal.hs
--- old/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time/Internal.hs
2018-09-24 03:52:40.000000000 +0200
+++ new/attoparsec-iso8601-1.0.2.0/Data/Attoparsec/Time/Internal.hs
2001-09-09 03:46:40.000000000 +0200
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
{-# LANGUAGE NoImplicitPrelude #-}
-- |
-- Module: Data.Aeson.Internal.Time
@@ -19,34 +18,10 @@
import Prelude.Compat
+import Data.Fixed (Fixed(MkFixed), Pico)
import Data.Int (Int64)
-import Data.Time
-import Unsafe.Coerce (unsafeCoerce)
-
-#if MIN_VERSION_time(1,6,0)
-
-import Data.Time.Clock (diffTimeToPicoseconds)
-
-#endif
-
-#if MIN_VERSION_base(4,7,0)
-
-import Data.Fixed (Pico, Fixed(MkFixed))
-
-#else
-
-import Data.Fixed (Pico)
-
-#endif
-
-#if !MIN_VERSION_time(1,6,0)
-
-diffTimeToPicoseconds :: DiffTime -> Integer
-diffTimeToPicoseconds = unsafeCoerce
-
-#endif
-
-#if MIN_VERSION_base(4,7,0)
+import Data.Time (TimeOfDay(..))
+import Data.Time.Clock.Compat
toPico :: Integer -> Pico
toPico = MkFixed
@@ -54,16 +29,6 @@
fromPico :: Pico -> Integer
fromPico (MkFixed i) = i
-#else
-
-toPico :: Integer -> Pico
-toPico = unsafeCoerce
-
-fromPico :: Pico -> Integer
-fromPico = unsafeCoerce
-
-#endif
-
-- | Like TimeOfDay, but using a fixed-width integer for seconds.
data TimeOfDay64 = TOD {-# UNPACK #-} !Int
{-# UNPACK #-} !Int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time.hs
new/attoparsec-iso8601-1.0.2.0/Data/Attoparsec/Time.hs
--- old/attoparsec-iso8601-1.0.1.0/Data/Attoparsec/Time.hs 2018-09-24
03:52:40.000000000 +0200
+++ new/attoparsec-iso8601-1.0.2.0/Data/Attoparsec/Time.hs 2001-09-09
03:46:40.000000000 +0200
@@ -19,6 +19,8 @@
, timeZone
, utcTime
, zonedTime
+ , month
+ , quarter
) where
import Prelude.Compat
@@ -33,6 +35,8 @@
import Data.Int (Int64)
import Data.Maybe (fromMaybe)
import Data.Time.Calendar (Day, fromGregorianValid)
+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..),
fromYearQuarter)
+import Data.Time.Calendar.Month.Compat (Month, fromYearMonthValid)
import Data.Time.Clock (UTCTime(..))
import qualified Data.Text as T
import qualified Data.Time.LocalTime as Local
@@ -46,6 +50,28 @@
d <- twoDigits <|> fail "date must be of form [+,-]YYYY-MM-DD"
maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
+-- | Parse a month of the form @[+,-]YYYY-MM@.
+month :: Parser Month
+month = do
+ absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
+ y <- (decimal <* char '-') <|> fail "month must be of form [+,-]YYYY-MM"
+ m <- twoDigits <|> fail "month must be of form [+,-]YYYY-MM"
+ maybe (fail "invalid month") return (fromYearMonthValid (absOrNeg y) m)
+
+-- | Parse a quarter of the form @[+,-]YYYY-QN@.
+quarter :: Parser Quarter
+quarter = do
+ absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
+ y <- (decimal <* char '-') <|> fail "month must be of form [+,-]YYYY-MM"
+ _ <- char 'q' <|> char 'Q'
+ q <- parseQ
+ return $! fromYearQuarter (absOrNeg y) q
+ where
+ parseQ = Q1 <$ char '1'
+ <|> Q2 <$ char '2'
+ <|> Q3 <$ char '3'
+ <|> Q4 <$ char '4'
+
-- | Parse a two-digit integer (e.g. day of month, hour).
twoDigits :: Parser Int
twoDigits = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-iso8601-1.0.1.0/Setup.hs
new/attoparsec-iso8601-1.0.2.0/Setup.hs
--- old/attoparsec-iso8601-1.0.1.0/Setup.hs 2018-09-24 03:52:40.000000000
+0200
+++ new/attoparsec-iso8601-1.0.2.0/Setup.hs 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601.cabal
new/attoparsec-iso8601-1.0.2.0/attoparsec-iso8601.cabal
--- old/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601.cabal 2018-09-24
03:52:40.000000000 +0200
+++ new/attoparsec-iso8601-1.0.2.0/attoparsec-iso8601.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,5 @@
name: attoparsec-iso8601
-version: 1.0.1.0
+version: 1.0.2.0
synopsis: Parsing of ISO 8601 dates, originally from aeson.
description: Parsing of ISO 8601 dates, originally from aeson.
license: BSD3
@@ -11,9 +11,10 @@
maintainer: Adam Bergmark <[email protected]>
stability: experimental
cabal-version: >=1.10
-homepage: https://github.com/bos/aeson
-bug-reports: https://github.com/bos/aeson/issues
+homepage: https://github.com/haskell/aeson
+bug-reports: https://github.com/haskell/aeson/issues
build-type: Simple
+tested-with: 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
extra-source-files:
README.md
@@ -35,11 +36,12 @@
Data.Attoparsec.Time.Internal
Data.Attoparsec.Time
build-depends:
- attoparsec >= 0.13.0.1,
- base >= 4.5 && < 5,
- base-compat >= 0.9.1 && < 0.11,
- text >= 1.1.1.0,
- time >= 1.1.1.4
+ attoparsec >= 0.13.0.1 && < 0.14.0.0,
+ base >= 4.7 && < 5,
+ base-compat-batteries >= 0.10.0 && < 0.12,
+ time-compat >= 1.9.4 && < 1.10,
+ text >= 1.1.1.0 && < 1.3.0.0,
+ time >= 1.1.1.4 && < 1.12
if flag(fast)
ghc-options: -O0
@@ -52,4 +54,5 @@
source-repository head
type: git
- location: git://github.com/bos/aeson.git
+ location: git://github.com/haskell/aeson.git
+ subdir: attoparsec-iso8601
