Hello community,
here is the log from the commit of package ghc-HsOpenSSL for openSUSE:Factory checked in at 2017-05-16 14:45:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-HsOpenSSL (Old)
and /work/SRC/openSUSE:Factory/.ghc-HsOpenSSL.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-HsOpenSSL"
Tue May 16 14:45:38 2017 rev:7 rq:494899 version:0.11.4.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-HsOpenSSL/ghc-HsOpenSSL.changes 2017-05-06 18:28:08.176055354 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-HsOpenSSL.new/ghc-HsOpenSSL.changes 2017-05-16 14:46:38.750562788 +0200
@@ -1,0 +2,15 @@
+Wed May 3 08:24:07 UTC 2017 - psimons@suse.com
+
+- Update to version 0.11.4.8 with cabal2obs.
+
+-------------------------------------------------------------------
+Sat Apr 29 18:32:33 UTC 2017 - psimons@suse.com
+
+- Update to version 0.11.4.7 revision 1 with cabal2obs.
+
+-------------------------------------------------------------------
+Mon Apr 24 12:33:13 UTC 2017 - psimons@suse.com
+
+- Update to version 0.11.4.7 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
HsOpenSSL-0.11.4.6.tar.gz
New:
----
HsOpenSSL-0.11.4.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-HsOpenSSL.spec ++++++
--- /var/tmp/diff_new_pack.G6H3He/_old 2017-05-16 14:46:39.326481875 +0200
+++ /var/tmp/diff_new_pack.G6H3He/_new 2017-05-16 14:46:39.330481313 +0200
@@ -19,7 +19,7 @@
%global pkg_name HsOpenSSL
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.11.4.6
+Version: 0.11.4.8
Release: 0
Summary: Partial OpenSSL binding for Haskell
License: SUSE-Public-Domain
++++++ HsOpenSSL-0.11.4.6.tar.gz -> HsOpenSSL-0.11.4.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.6/ChangeLog new/HsOpenSSL-0.11.4.8/ChangeLog
--- old/HsOpenSSL-0.11.4.6/ChangeLog 2017-04-05 17:17:17.000000000 +0200
+++ new/HsOpenSSL-0.11.4.8/ChangeLog 2017-04-26 21:37:53.000000000 +0200
@@ -1,3 +1,17 @@
+2017-04-26 Vladimir Shabanov
+
+ * HsOpenSSL.cabal (Version): Bump version to 0.11.4.8
+
+ * Setup.hs: Updated for Cabal-2.0
+ by Eric Mertens @glguy (#24)
+
+2017-04-17 Vladimir Shabanov
+
+ * HsOpenSSL.cabal (Version): Bump version to 0.11.4.7
+
+ * Support for MinGW64,
+ by @varosi (#23)
+
2017-04-05 Vladimir Shabanov
* HsOpenSSL.cabal (Version): Bump version to 0.11.4.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.6/HsOpenSSL.cabal new/HsOpenSSL-0.11.4.8/HsOpenSSL.cabal
--- old/HsOpenSSL-0.11.4.6/HsOpenSSL.cabal 2017-04-05 17:17:17.000000000 +0200
+++ new/HsOpenSSL-0.11.4.8/HsOpenSSL.cabal 2017-04-26 21:37:53.000000000 +0200
@@ -12,7 +12,7 @@
http://hackage.haskell.org/package/tls, which is a pure Haskell
implementation of SSL.
.
-Version: 0.11.4.6
+Version: 0.11.4.8
License: PublicDomain
License-File: COPYING
Author: Adam Langley, Mikhail Vorozhtsov, PHO, Taru Karttunen
@@ -61,6 +61,10 @@
Default:
False
+Custom-setup
+ setup-depends: Cabal >=1.12 && <2.1,
+ base >=4.4 && <5
+
Library
Build-Depends:
base >= 4.4 && < 5,
@@ -84,7 +88,12 @@
Extra-Lib-Dirs: /opt/local/lib
if os(mingw32)
- Extra-Libraries: eay32 ssl32
+ if arch(x86_64)
+ Extra-Libraries: eay32 ssl
+
+ if arch(i386)
+ Extra-Libraries: eay32 ssl32
+
C-Sources: cbits/mutex-win.c
CC-Options: -D MINGW32
CPP-Options: -DCALLCONV=stdcall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HsOpenSSL-0.11.4.6/Setup.hs new/HsOpenSSL-0.11.4.8/Setup.hs
--- old/HsOpenSSL-0.11.4.6/Setup.hs 2017-04-05 17:17:17.000000000 +0200
+++ new/HsOpenSSL-0.11.4.8/Setup.hs 2017-04-26 21:37:53.000000000 +0200
@@ -1,11 +1,18 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE TupleSections #-}
+#ifndef MIN_VERSION_Cabal
+-- MIN_VERSION_Cabal is defined and available to custom Setup.hs scripts
+-- if either GHC >= 8.0 or cabal-install >= 1.24 is used.
+-- So if it isn't defined, it's very likely we don't have Cabal >= 2.0.
+#define MIN_VERSION_Cabal(x,y,z) 0
+#endif
+
import Distribution.Simple
import Distribution.Simple.Setup (ConfigFlags(..), toFlag)
import Distribution.Simple.LocalBuildInfo (localPkgDescr)
-#if __GLASGOW_HASKELL__ >= 802
+#if MIN_VERSION_Cabal(2,0,0)
import Distribution.PackageDescription (FlagName(..), mkFlagName)
#else
import Distribution.PackageDescription (FlagName(..))
@@ -18,6 +25,10 @@
import Control.Monad (forM)
import Data.List
+#if !(MIN_VERSION_Cabal(2,0,0))
+mkFlagName = FlagName
+#endif
+
-- On macOS we're checking whether OpenSSL library is avaiable
-- and if not, we're trying to find Homebrew or MacPorts OpenSSL installations.
--
@@ -97,8 +108,3 @@
where ue e | isUserError e = Just e
| otherwise = Nothing
-
-#if __GLASGOW_HASKELL__ < 802
-mkFlagName = FlagName
-#endif
-
