Hello community, here is the log from the commit of package ghc-twitter-feed for openSUSE:Factory checked in at 2017-01-31 12:39:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-twitter-feed (Old) and /work/SRC/openSUSE:Factory/.ghc-twitter-feed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-twitter-feed" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-twitter-feed/ghc-twitter-feed.changes 2017-01-18 21:35:46.735735801 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-twitter-feed.new/ghc-twitter-feed.changes 2017-02-03 17:40:20.362296068 +0100 @@ -1,0 +2,25 @@ +Wed Jan 4 21:24:54 UTC 2017 - psimons@suse.com + +- Update to version 0.2.0.11 revision 1 with cabal2obs. + +------------------------------------------------------------------- +Thu Oct 27 15:55:39 UTC 2016 - psimons@suse.com + +- Update to version 0.2.0.11 with cabal2obs. + +------------------------------------------------------------------- +Mon Oct 17 15:37:28 UTC 2016 - psimons@suse.com + +- Update to version 0.2.0.10 with cabal2obs. + +------------------------------------------------------------------- +Thu Sep 15 06:51:59 UTC 2016 - psimons@suse.com + +- Update to version 0.2.0.9 revision 0 with cabal2obs. + +------------------------------------------------------------------- +Wed Aug 17 18:27:52 UTC 2016 - psimons@suse.com + +- Update to version 0.2.0.8 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- twitter-feed-0.2.0.7.tar.gz New: ---- twitter-feed-0.2.0.11.tar.gz twitter-feed.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-twitter-feed.spec ++++++ --- /var/tmp/diff_new_pack.gfhNnf/_old 2017-02-03 17:40:20.750241158 +0100 +++ /var/tmp/diff_new_pack.gfhNnf/_new 2017-02-03 17:40:20.754240592 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-twitter-feed # -# 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 @@ -19,15 +19,15 @@ %global pkg_name twitter-feed %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.0.7 +Version: 0.2.0.11 Release: 0 Summary: Client for fetching Twitter timeline via Oauth License: MIT -Group: System/Libraries +Group: Development/Languages/Other 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 -# Begin cabal-rpm deps: BuildRequires: ghc-aeson-devel BuildRequires: ghc-authenticate-oauth-devel BuildRequires: ghc-bytestring-devel @@ -40,7 +40,6 @@ BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel %endif -# End cabal-rpm deps %description Fetches a user timeline from Twitter, and optionally linkifies the results @@ -59,21 +58,16 @@ %prep %setup -q -n %{pkg_name}-%{version} - +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ twitter-feed-0.2.0.7.tar.gz -> twitter-feed-0.2.0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twitter-feed-0.2.0.7/src/Web/Twitter/Feed.hs new/twitter-feed-0.2.0.11/src/Web/Twitter/Feed.hs --- old/twitter-feed-0.2.0.7/src/Web/Twitter/Feed.hs 2016-06-08 00:29:14.000000000 +0200 +++ new/twitter-feed-0.2.0.11/src/Web/Twitter/Feed.hs 2016-10-10 20:56:21.000000000 +0200 @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings, DeriveGeneric #-} +{-# LANGUAGE OverloadedStrings, CPP #-} ----------------------------------------------------------------------------- -- | @@ -20,6 +20,7 @@ import qualified Data.ByteString.Lazy as BS import Network.HTTP.Conduit +import Network.HTTP.Client.Conduit (defaultManagerSettings) import Web.Authenticate.OAuth import Data.Aeson import Data.List (elemIndices, sort) @@ -43,13 +44,17 @@ Right ts -> Right $ map (simplifyTweet . linkifyTweet) ts createRequest :: String -> Int -> Bool -> IO Request -createRequest username count excludeReplies = parseUrl $ timelineUrl username count excludeReplies +createRequest username count excludeReplies = parseUrlThrow $ timelineUrl username count excludeReplies +#if (!MIN_VERSION_http_conduit(2,1,11)) + where + parseUrlThrow = parseUrl +#endif getResponse :: OAuth -> Credential -> Request -> IO (Response BS.ByteString) -getResponse oauth credential req = - withManager $ \m -> do - signedreq <- signOAuth oauth credential req - httpLbs signedreq m +getResponse oauth credential req = do + m <- newManager defaultManagerSettings + signedreq <- signOAuth oauth credential req + httpLbs signedreq m decodeTweets :: Response BS.ByteString -> Either String [Tweet] decodeTweets = eitherDecode . responseBody @@ -62,7 +67,7 @@ timelineUrl user count excludeReplies = "https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name=" ++ user ++ "&count=" ++ show count ++ "&exclude_replies=" ++ - (map toLower $ show excludeReplies) + map toLower (show excludeReplies) linkifyTweet :: Tweet -> Tweet linkifyTweet tweet = Tweet (processText (text tweet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twitter-feed-0.2.0.7/test/Web/Twitter/Feed/Tests.hs new/twitter-feed-0.2.0.11/test/Web/Twitter/Feed/Tests.hs --- old/twitter-feed-0.2.0.7/test/Web/Twitter/Feed/Tests.hs 2016-06-08 00:29:14.000000000 +0200 +++ new/twitter-feed-0.2.0.11/test/Web/Twitter/Feed/Tests.hs 2016-10-10 20:56:21.000000000 +0200 @@ -19,9 +19,8 @@ timelineUrlTest :: Assertion timelineUrlTest = timelineUrl "someone" 3 True @?= expected where - expected = concat [ "https://api.twitter.com/1.1/statuses/user_timeline.json" - , "?screen_name=someone&count=3&exclude_replies=true" - ] + expected = "https://api.twitter.com/1.1/statuses/user_timeline.json" ++ + "?screen_name=someone&count=3&exclude_replies=true" sortLinkTest :: Assertion sortLinkTest = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/twitter-feed-0.2.0.7/twitter-feed.cabal new/twitter-feed-0.2.0.11/twitter-feed.cabal --- old/twitter-feed-0.2.0.7/twitter-feed.cabal 2016-06-08 00:29:14.000000000 +0200 +++ new/twitter-feed-0.2.0.11/twitter-feed.cabal 2016-10-17 18:14:25.000000000 +0200 @@ -1,5 +1,5 @@ name: twitter-feed -version: 0.2.0.7 +version: 0.2.0.11 synopsis: Client for fetching Twitter timeline via Oauth description: Fetches a user timeline from Twitter, and optionally linkifies the results using the Twitter entity API. homepage: https://github.com/stackbuilders/twitter-feed @@ -23,9 +23,9 @@ build-depends: base >= 4.6 && < 4.10, - aeson >= 0.8 && < 0.12, + aeson >= 0.8 && < 1.1, authenticate-oauth >= 1.5 && < 1.7, - http-conduit >= 2.1.4 && < 2.2.0, + http-conduit >= 2.1.4 && < 2.3, bytestring >= 0.10 && < 0.11 hs-source-dirs: src @@ -39,7 +39,7 @@ base, twitter-feed, containers >= 0.5 && < 0.6, - HUnit >= 1.2 && < 1.4, + HUnit >= 1.2 && < 1.6, test-framework >= 0.8 && < 0.9, test-framework-hunit >= 0.3 && < 0.4 ++++++ twitter-feed.cabal ++++++ name: twitter-feed version: 0.2.0.11 x-revision: 1 synopsis: Client for fetching Twitter timeline via Oauth description: Fetches a user timeline from Twitter, and optionally linkifies the results using the Twitter entity API. homepage: https://github.com/stackbuilders/twitter-feed license: MIT license-file: LICENSE author: Justin Leitgeb, Andrés Torres maintainer: justin@stackbuilders.com category: Web build-type: Simple extra-source-files: cabal-version: >=1.10 source-repository head type: git location: https://github.com/stackbuilders/twitter-feed.git library exposed-modules: Web.Twitter.Feed Web.Twitter.Types ghc-options: -Wall build-depends: base >= 4.6 && < 4.10, aeson >= 0.8 && < 1.2, authenticate-oauth >= 1.5 && < 1.7, http-conduit >= 2.1.4 && < 2.3, bytestring >= 0.10 && < 0.11 hs-source-dirs: src default-language: Haskell2010 test-suite twitter-library type: exitcode-stdio-1.0 hs-source-dirs: test main-is: Suite.hs build-depends: base, twitter-feed, containers >= 0.5 && < 0.6, HUnit >= 1.2 && < 1.6, test-framework >= 0.8 && < 0.9, test-framework-hunit >= 0.3 && < 0.4 default-language: Haskell2010 ghc-options: -Wall other-modules: Web.Twitter.Feed.Tests