commit ghc-download for openSUSE:Factory

Hello community, here is the log from the commit of package ghc-download for openSUSE:Factory checked in at 2017-04-11 09:37:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-download (Old) and /work/SRC/openSUSE:Factory/.ghc-download.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-download" Tue Apr 11 09:37:35 2017 rev:2 rq:483921 version:0.3.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-download/ghc-download.changes 2017-03-24 01:54:45.652447666 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-download.new/ghc-download.changes 2017-04-11 09:37:35.881201756 +0200 @@ -1,0 +2,5 @@ +Sun Nov 6 21:25:54 UTC 2016 - psimons@suse.com + +- Update to version 0.3.2.5 with cabal2obs. + +------------------------------------------------------------------- Old: ---- download-0.3.2.4.tar.gz New: ---- download-0.3.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-download.spec ++++++ --- /var/tmp/diff_new_pack.NMCd2S/_old 2017-04-11 09:37:36.369132830 +0200 +++ /var/tmp/diff_new_pack.NMCd2S/_new 2017-04-11 09:37:36.373132265 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-download # -# 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,14 @@ %global pkg_name download %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.2.4 +Version: 0.3.2.5 Release: 0 Summary: High-level file download based on URLs License: BSD-3-Clause -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 BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-feed-devel BuildRequires: ghc-rpm-macros @@ -37,7 +36,6 @@ %if %{with tests} BuildRequires: ghc-hspec-devel %endif -# End cabal-rpm deps %description High-level file download based on URLs. @@ -56,20 +54,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 ++++++ download-0.3.2.4.tar.gz -> download-0.3.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/ChangeLog.md new/download-0.3.2.5/ChangeLog.md --- old/download-0.3.2.4/ChangeLog.md 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/ChangeLog.md 2016-10-31 10:37:30.000000000 +0100 @@ -1,3 +1,9 @@ +## 0.3.2.5 + +* OSX Support added. Thanks to Brian Crowder. +* Package backported to old versions of ghc. Thanks to @thielema. +* Add Travis support for GHC 8 + ## 0.3.2.4 * Fix C code warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/Network/Download.hsc new/download-0.3.2.5/Network/Download.hsc --- old/download-0.3.2.4/Network/Download.hsc 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/Network/Download.hsc 2016-10-29 19:23:36.000000000 +0200 @@ -36,7 +36,9 @@ ) where -import Foreign +import Foreign.Ptr +import Foreign.ForeignPtr +import Foreign.Marshal.Alloc import Foreign.C.Types import Foreign.C.String @@ -45,6 +47,7 @@ import qualified Data.ByteString.Internal as S import qualified Data.ByteString.Char8 as Char8 +import Data.Word (Word8) -- Parsers import qualified Text.HTML.TagSoup as TagSoup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/Spec.hs new/download-0.3.2.5/Spec.hs --- old/download-0.3.2.4/Spec.hs 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/Spec.hs 2016-10-29 19:23:36.000000000 +0200 @@ -1,6 +1,9 @@ import Test.Hspec import Network.Download -import Data.Either (isRight) + +-- available in base starting with base-4.6 +isRight :: Either a b -> Bool +isRight = either (const False) (const True) main :: IO () main = hspec $ do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/cbits/ftp.c new/download-0.3.2.5/cbits/ftp.c --- old/download-0.3.2.4/cbits/ftp.c 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/cbits/ftp.c 2016-10-29 20:34:18.000000000 +0200 @@ -63,7 +63,9 @@ #include #include +#ifndef __APPLE__ #include +#endif #include #include #include @@ -582,12 +584,16 @@ io->dconn = dconn; io->dir = mode; io->eof = io->err = 0; - cookie_io_functions_t cookies; - cookies.read = (cookie_read_function_t *)_ftp_readfn; - cookies.write = (cookie_write_function_t *)_ftp_writefn; - cookies.seek = (cookie_seek_function_t *)_ftp_seekfn; - cookies.close = (cookie_close_function_t *)_ftp_closefn; - f = fopencookie(io, "rw", cookies); +#ifndef __APPLE__ + cookie_io_functions_t cookies; + cookies.read = (cookie_read_function_t *)_ftp_readfn; + cookies.write = (cookie_write_function_t *)_ftp_writefn; + cookies.seek = (cookie_seek_function_t *)_ftp_seekfn; + cookies.close = (cookie_close_function_t *)_ftp_closefn; + f = fopencookie(io, "rw", cookies); +#else + f = funopen(io, _ftp_readfn, _ftp_writefn, _ftp_seekfn, _ftp_closefn); +#endif if (f == NULL) free(io); return (f); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/cbits/http.c new/download-0.3.2.5/cbits/http.c --- old/download-0.3.2.4/cbits/http.c 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/cbits/http.c 2016-10-29 20:34:18.000000000 +0200 @@ -67,7 +67,9 @@ #include #include +#ifndef __APPLE__ #include +#endif #include #include #include @@ -321,12 +323,16 @@ } io->conn = conn; io->chunked = chunked; - cookie_io_functions_t cookie; - cookie.read = (cookie_read_function_t *)_http_readfn; - cookie.write = (cookie_write_function_t *)_http_writefn; - cookie.seek = (cookie_seek_function_t *)NULL; - cookie.close = (cookie_close_function_t *)_http_closefn; - f = fopencookie(io, "rw", cookie); +#ifndef __APPLE__ + cookie_io_functions_t cookie; + cookie.read = (cookie_read_function_t *)_http_readfn; + cookie.write = (cookie_write_function_t *)_http_writefn; + cookie.seek = (cookie_seek_function_t *)NULL; + cookie.close = (cookie_close_function_t *)_http_closefn; + f = fopencookie(io, "rw", cookie); +#else + f = funopen(io, _http_readfn, _http_writefn, NULL, _http_closefn); +#endif if (f == NULL) { _download_syserr(); free(io); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/download-0.3.2.4/download.cabal new/download-0.3.2.5/download.cabal --- old/download-0.3.2.4/download.cabal 2016-03-10 08:11:11.000000000 +0100 +++ new/download-0.3.2.5/download.cabal 2016-10-31 10:33:46.000000000 +0100 @@ -1,5 +1,5 @@ name: download -version: 0.3.2.4 +version: 0.3.2.5 homepage: https://github.com/psibi/download synopsis: High-level file download based on URLs description: High-level file download based on URLs @@ -10,7 +10,7 @@ license-file: LICENSE copyright: (c) 2008-2011, Don Stewart author: Don Stewart -maintainer: Sibi Prabakaran , Don Stewart +maintainer: Sibi Prabakaran cabal-version: >= 1.8 build-type: Simple tested-with: GHC ==7.10.3 @@ -79,6 +79,6 @@ ghc-options: -Wall main-is: Spec.hs - build-depends: base >= 4.6 && < 5, + build-depends: base >= 4.5 && < 5, download, hspec == 2.*