Hello community,
here is the log from the commit of package ghc-aws for openSUSE:Factory checked
in at 2016-11-10 13:19:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-aws (Old)
and /work/SRC/openSUSE:Factory/.ghc-aws.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-aws"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-aws/ghc-aws.changes 2016-10-23
12:50:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-aws.new/ghc-aws.changes 2016-11-10
13:19:38.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 11 08:49:46 UTC 2016 - psim...@suse.com
+
+- Update to version 0.14.1 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
aws-0.14.0.tar.gz
New:
----
aws-0.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-aws.spec ++++++
--- /var/tmp/diff_new_pack.EzEX3O/_old 2016-11-10 13:19:39.000000000 +0100
+++ /var/tmp/diff_new_pack.EzEX3O/_new 2016-11-10 13:19:39.000000000 +0100
@@ -19,7 +19,7 @@
%global pkg_name aws
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.14.0
+Version: 0.14.1
Release: 0
Summary: Amazon Web Services (AWS) for Haskell
License: BSD-3-Clause
++++++ aws-0.14.0.tar.gz -> aws-0.14.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/Aws/DynamoDb/Commands/UpdateItem.hs
new/aws-0.14.1/Aws/DynamoDb/Commands/UpdateItem.hs
--- old/aws-0.14.0/Aws/DynamoDb/Commands/UpdateItem.hs 2016-06-04
18:23:48.000000000 +0200
+++ new/aws-0.14.1/Aws/DynamoDb/Commands/UpdateItem.hs 2016-10-05
19:07:50.000000000 +0200
@@ -19,7 +19,15 @@
--
----------------------------------------------------------------------------
-module Aws.DynamoDb.Commands.UpdateItem where
+module Aws.DynamoDb.Commands.UpdateItem
+ ( UpdateItem(..)
+ , updateItem
+ , AttributeUpdate(..)
+ , au
+ , UpdateAction(..)
+ , UpdateItem(..)
+ , UpdateItemResponse(..)
+ ) where
-------------------------------------------------------------------------------
import Control.Applicative
@@ -55,7 +63,10 @@
updateItem tn key ups = UpdateItem tn key ups def def def def
-type AttributeUpdates = [AttributeUpdate]
+-- | A helper to avoid overlapping instances for 'ToJSON'.
+newtype AttributeUpdates = AttributeUpdates {
+ getAttributeUpdates :: [AttributeUpdate]
+ }
data AttributeUpdate = AttributeUpdate {
@@ -77,7 +88,7 @@
instance ToJSON AttributeUpdates where
- toJSON = object . map mk
+ toJSON = object . map mk . getAttributeUpdates
where
mk AttributeUpdate { auAction = UDelete, auAttr = auAttr } =
(attrName auAttr) .= object
@@ -114,7 +125,7 @@
object $ expectsJson uiExpect ++
[ "TableName" .= uiTable
, "Key" .= uiKey
- , "AttributeUpdates" .= uiUpdates
+ , "AttributeUpdates" .= AttributeUpdates uiUpdates
, "ReturnValues" .= uiReturn
, "ReturnConsumedCapacity" .= uiRetCons
, "ReturnItemCollectionMetrics" .= uiRetMet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/Aws/S3/Commands/GetService.hs
new/aws-0.14.1/Aws/S3/Commands/GetService.hs
--- old/aws-0.14.0/Aws/S3/Commands/GetService.hs 2016-06-04
18:23:48.000000000 +0200
+++ new/aws-0.14.1/Aws/S3/Commands/GetService.hs 2016-10-05
19:07:50.000000000 +0200
@@ -6,9 +6,7 @@
import Aws.S3.Core
import Data.Maybe
import Data.Time.Format
-#if MIN_VERSION_time(1,5,0)
-import Data.Time.Format
-#else
+#if !MIN_VERSION_time(1,5,0)
import System.Locale
#endif
import Text.XML.Cursor (($/), ($//), (&|))
@@ -60,4 +58,4 @@
instance AsMemoryResponse GetServiceResponse where
type MemoryResponse GetServiceResponse = GetServiceResponse
- loadToMemory = return
\ No newline at end of file
+ loadToMemory = return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/Aws/S3/Commands/PutObject.hs
new/aws-0.14.1/Aws/S3/Commands/PutObject.hs
--- old/aws-0.14.0/Aws/S3/Commands/PutObject.hs 2016-06-04 18:23:48.000000000
+0200
+++ new/aws-0.14.1/Aws/S3/Commands/PutObject.hs 2016-10-05 19:07:50.000000000
+0200
@@ -66,7 +66,7 @@
, ("x-amz-storage-class",) <$>
writeStorageClass <$> poStorageClass
,
("x-amz-website-redirect-location",) <$> poWebsiteRedirectLocation
,
("x-amz-server-side-encryption",) <$> writeServerSideEncryption <$>
poServerSideEncryption
- , if poAutoMakeBucket then Just
("x-amz-auto-make-bucket", "1") else Nothing
+ , if poAutoMakeBucket then Just
("x-amz-auto-make-bucket", "1") else Nothing
] ++ map( \x -> (CI.mk .
T.encodeUtf8 $ T.concat ["x-amz-meta-", fst x], snd x)) poMetadata
, s3QOtherHeaders = map (second T.encodeUtf8) $
catMaybes [
("Expires",) . T.pack . show <$>
poExpires
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/Aws/SimpleDb/Core.hs
new/aws-0.14.1/Aws/SimpleDb/Core.hs
--- old/aws-0.14.0/Aws/SimpleDb/Core.hs 2016-06-04 18:23:48.000000000 +0200
+++ new/aws-0.14.1/Aws/SimpleDb/Core.hs 2016-10-05 19:07:50.000000000 +0200
@@ -32,7 +32,7 @@
instance C.Exception SdbError
-data SdbMetadata
+data SdbMetadata
= SdbMetadata {
requestId :: Maybe T.Text
, boxUsage :: Maybe T.Text
@@ -63,11 +63,11 @@
debugServiceConfig = sdbHttpPost sdbUsEast
instance DefaultServiceConfiguration (SdbConfiguration UriOnlyQuery) where
- defServiceConfig = sdbHttpsGet sdbUsEast
+ defServiceConfig = sdbHttpsGet sdbUsEast
debugServiceConfig = sdbHttpGet sdbUsEast
-
+
sdbUsEast :: B.ByteString
-sdbUsEast = "sdb.amazonaws.com"
+sdbUsEast = "sdb.amazonaws.com"
sdbUsWest :: B.ByteString
sdbUsWest = "sdb.us-west-1.amazonaws.com"
@@ -80,16 +80,16 @@
sdbApNortheast :: B.ByteString
sdbApNortheast = "sdb.ap-northeast-1.amazonaws.com"
-
+
sdbHttpGet :: B.ByteString -> SdbConfiguration qt
sdbHttpGet endpoint = SdbConfiguration HTTP Get endpoint (defaultPort HTTP)
-
+
sdbHttpPost :: B.ByteString -> SdbConfiguration NormalQuery
sdbHttpPost endpoint = SdbConfiguration HTTP PostQuery endpoint (defaultPort
HTTP)
-
+
sdbHttpsGet :: B.ByteString -> SdbConfiguration qt
sdbHttpsGet endpoint = SdbConfiguration HTTPS Get endpoint (defaultPort HTTPS)
-
+
sdbHttpsPost :: B.ByteString -> SdbConfiguration NormalQuery
sdbHttpsPost endpoint = SdbConfiguration HTTPS PostQuery endpoint (defaultPort
HTTPS)
@@ -122,13 +122,13 @@
, ("AWSAccessKeyId", accessKeyID cr)
, ("SignatureMethod", amzHash ah)
, ("SignatureVersion", "2")]
- ++ maybe [] (\tok -> [("SecurityToken", tok)]) (iamToken cr)
+ ++ maybe [] (\tok -> [("SecurityToken", tok)]) (iamToken cr)
sq = ("Signature", Just sig) : q'
method = sdbiHttpMethod si
host = sdbiHost si
path = "/"
sig = signature cr ah stringToSign
- stringToSign = Blaze.toByteString . mconcat $
+ stringToSign = Blaze.toByteString . mconcat $
intersperse (Blaze8.fromChar '\n')
[Blaze.copyByteString $ httpMethod method
, Blaze.copyByteString $ host
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/CHANGELOG.md new/aws-0.14.1/CHANGELOG.md
--- old/aws-0.14.0/CHANGELOG.md 2016-06-04 18:23:48.000000000 +0200
+++ new/aws-0.14.1/CHANGELOG.md 2016-10-05 19:07:50.000000000 +0200
@@ -2,6 +2,9 @@
NOTES: 0.14 brings potentially breaking changes
+- 0.14.1
+ - Eliminate orphan instance that conflicted with aeson-1.0
+ - Add upper bound on http-client in testsuite
- 0.14
- transformers 0.5 support
- data-default 0.6 support (also in 0.13.1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aws-0.14.0/aws.cabal new/aws-0.14.1/aws.cabal
--- old/aws-0.14.0/aws.cabal 2016-06-04 18:23:48.000000000 +0200
+++ new/aws-0.14.1/aws.cabal 2016-10-05 19:07:50.000000000 +0200
@@ -1,5 +1,5 @@
Name: aws
-Version: 0.14.0
+Version: 0.14.1
Synopsis: Amazon Web Services (AWS) for Haskell
Description: Bindings for Amazon Web Services (AWS), with the aim of
supporting all AWS services. To see a high level overview of the library, see
the README at <https://github.com/aristidb/aws/blob/master/README.md>.
Homepage: http://github.com/aristidb/aws
@@ -327,7 +327,7 @@
base == 4.*,
bytestring >= 0.10,
errors >= 2.0,
- http-client >= 0.3,
+ http-client >= 0.3 && < 0.5,
lifted-base >= 0.2,
monad-control >= 0.3,
mtl >= 2.1,
@@ -388,8 +388,8 @@
aws,
base == 4.*,
bytestring,
- http-client,
- http-client-tls,
+ http-client < 0.5,
+ http-client-tls < 0.5,
http-types,
resourcet,
tasty >= 0.8,
