Hello community,
here is the log from the commit of package ghc-mod for openSUSE:Factory checked in at 2017-04-14 13:32:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-mod (Old)
and /work/SRC/openSUSE:Factory/.ghc-mod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-mod"
Fri Apr 14 13:32:21 2017 rev:11 rq:477458 version:5.7.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-mod/ghc-mod.changes 2017-02-03 17:39:25.310088184 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-mod.new/ghc-mod.changes 2017-04-14 13:32:50.400780512 +0200
@@ -1,0 +2,5 @@
+Sun Feb 12 14:18:52 UTC 2017 - psimons@suse.com
+
+- Update to version 5.7.0.0 revision 1 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
ghc-mod-5.6.0.0.tar.gz
New:
----
ghc-mod-5.7.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-mod.spec ++++++
--- /var/tmp/diff_new_pack.kaYIVI/_old 2017-04-14 13:32:51.080684426 +0200
+++ /var/tmp/diff_new_pack.kaYIVI/_new 2017-04-14 13:32:51.084683861 +0200
@@ -19,14 +19,14 @@
%global pkg_name ghc-mod
%bcond_with tests
Name: %{pkg_name}
-Version: 5.6.0.0
+Version: 5.7.0.0
Release: 0
Summary: Happy Haskell Programming
-License: AGPL-3.0+ and BSD-3-Clause
+License: AGPL-3.0+ AND BSD-3-Clause
Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/4.cabal#/%{name}.cabal
+Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-binary-devel
@@ -55,6 +55,7 @@
BuildRequires: ghc-process-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-safe-devel
+BuildRequires: ghc-semigroups-devel
BuildRequires: ghc-split-devel
BuildRequires: ghc-syb-devel
BuildRequires: ghc-template-haskell-devel
@@ -63,7 +64,11 @@
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-base-devel
BuildRequires: ghc-transformers-devel
+Requires: ghc
+Requires: ghc-cabal-helper
+Suggests: cabal-install
Suggests: emacs-haskell-mode
+Suggests: hlint
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-doctest-devel
@@ -104,15 +109,14 @@
cp -p %{SOURCE1} %{name}.cabal
%build
-%define cabal_configure_options --libexecdir=%{_libexecdir}
%ghc_lib_build
%install
%ghc_lib_install
%ghc_fix_rpath %{pkg_name}-%{version}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-echo 'export cabal_helper_libexecdir=%{_libexecdir}' > %{buildroot}%{_sysconfdir}/profile.d/ghc-mod.sh
-echo 'setenv cabal_helper_libexecdir %{_libexecdir}' > %{buildroot}%{_sysconfdir}/profile.d/ghc-mod.csh
+echo 'export cabal_helper_libexecdir=%{_libexecdir}/%{_arch}-%{_os}-ghc-%{ghc_version}/cabal-helper' > %{buildroot}%{_sysconfdir}/profile.d/ghc-mod.sh
+echo 'setenv cabal_helper_libexecdir %{_libexecdir}/%{_arch}-%{_os}-ghc-%{ghc_version}/cabal-helper' > %{buildroot}%{_sysconfdir}/profile.d/ghc-mod.csh
rm %{buildroot}%{_datadir}/%{name}-%{version}/LICENSE
rm %{buildroot}%{_datadir}/%{name}-%{version}/COPYING.AGPL3
rm %{buildroot}%{_datadir}/%{name}-%{version}/COPYING.BSD3
@@ -131,6 +135,7 @@
%doc LICENSE
%doc COPYING.BSD3
%doc COPYING.AGPL3
+%doc ChangeLog
%{_bindir}/%{name}
%{_bindir}/ghc-modi
%{_datadir}/%{name}-%{version}
@@ -145,5 +150,6 @@
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)
+%doc ChangeLog
%changelog
++++++ ghc-mod-5.6.0.0.tar.gz -> ghc-mod-5.7.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/ChangeLog new/ghc-mod-5.7.0.0/ChangeLog
--- old/ghc-mod-5.6.0.0/ChangeLog 2016-07-29 15:18:31.000000000 +0200
+++ new/ghc-mod-5.7.0.0/ChangeLog 2017-01-16 23:17:09.000000000 +0100
@@ -1,3 +1,8 @@
+2017-01-16 v5.7.0.0
+ * Bump cabal-helper to 0.7.3.0 to support Cabal-1.24.1.0
+ * Bump haskell-src-exts, optparse-applicative, pipes and extra
+ to be compatible with stackage.
+
2016-07-29 v5.6.0.0
* Bump cabal-helper to 0.7, adds support for Cabal-1.24
* Merge #737, `map-file` caching issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/Language/Haskell/GhcMod/FillSig.hs new/ghc-mod-5.7.0.0/Language/Haskell/GhcMod/FillSig.hs
--- old/ghc-mod-5.6.0.0/Language/Haskell/GhcMod/FillSig.hs 2016-07-29 15:18:31.000000000 +0200
+++ new/ghc-mod-5.7.0.0/Language/Haskell/GhcMod/FillSig.hs 2017-01-16 23:17:09.000000000 +0100
@@ -27,7 +27,11 @@
import qualified Class as Ty
import qualified Var as Ty
import qualified HsPat as Ty
+#if MIN_VERSION_haskell_src_exts(1,18,0)
+import qualified Language.Haskell.Exts as HE
+#else
import qualified Language.Haskell.Exts.Annotated as HE
+#endif
import Djinn.GHC
import qualified Language.Haskell.GhcMod.Gap as Gap
@@ -191,7 +195,11 @@
HE.TypeSig (HE.SrcSpanInfo s _) names ty ->
return $ HESignature s names ty
+#if MIN_VERSION_haskell_src_exts(1,18,0)
+ HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ _ ->
+#else
HE.TypeFamDecl (HE.SrcSpanInfo s _) declHead _ ->
+#endif
let (name, tys) = dHeadTyVars declHead in
return $ HEFamSignature s Open name (map cleanTyVarBind tys)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/Language/Haskell/GhcMod/SrcUtils.hs new/ghc-mod-5.7.0.0/Language/Haskell/GhcMod/SrcUtils.hs
--- old/ghc-mod-5.6.0.0/Language/Haskell/GhcMod/SrcUtils.hs 2016-07-29 15:18:31.000000000 +0200
+++ new/ghc-mod-5.7.0.0/Language/Haskell/GhcMod/SrcUtils.hs 2017-01-16 23:17:09.000000000 +0100
@@ -16,7 +16,11 @@
import qualified Type as G
import GHC.SYB.Utils
import GhcMonad
+#if MIN_VERSION_haskell_src_exts(1,18,0)
+import qualified Language.Haskell.Exts as HE
+#else
import qualified Language.Haskell.Exts.Annotated as HE
+#endif
import Language.Haskell.GhcMod.Doc
import Language.Haskell.GhcMod.Gap
import qualified Language.Haskell.GhcMod.Gap as Gap
@@ -175,7 +179,11 @@
typeSigInRangeHE :: Int -> Int -> HE.Decl HE.SrcSpanInfo -> Bool
typeSigInRangeHE lineNo colNo (HE.TypeSig (HE.SrcSpanInfo s _) _ _) =
HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
+#if MIN_VERSION_haskell_src_exts(1,18,0)
+typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _ _) =
+#else
typeSigInRangeHE lineNo colNo (HE.TypeFamDecl (HE.SrcSpanInfo s _) _ _) =
+#endif
HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
typeSigInRangeHE lineNo colNo (HE.DataFamDecl (HE.SrcSpanInfo s _) _ _ _) =
HE.srcSpanStart s <= (lineNo, colNo) && HE.srcSpanEnd s >= (lineNo, colNo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/cabal.project new/ghc-mod-5.7.0.0/cabal.project
--- old/ghc-mod-5.6.0.0/cabal.project 1970-01-01 01:00:00.000000000 +0100
+++ new/ghc-mod-5.7.0.0/cabal.project 2017-01-16 23:17:09.000000000 +0100
@@ -0,0 +1,3 @@
+-- do not build sub-packages when using features from
+-- http://blog.ezyang.com/2016/05/announcing-cabal-new-build-nix-style-local-bu...
+packages: .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/elisp/ghc.el new/ghc-mod-5.7.0.0/elisp/ghc.el
--- old/ghc-mod-5.6.0.0/elisp/ghc.el 2016-07-29 15:18:31.000000000 +0200
+++ new/ghc-mod-5.7.0.0/elisp/ghc.el 2017-01-16 23:17:09.000000000 +0100
@@ -28,7 +28,7 @@
(< emacs-minor-version minor)))
(error "ghc-mod requires at least Emacs %d.%d" major minor)))
-(defconst ghc-version "5.6.0.0")
+(defconst ghc-version "5.7.0.0")
(defgroup ghc-mod '() "ghc-mod customization")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ghc-mod-5.6.0.0/ghc-mod.cabal new/ghc-mod-5.7.0.0/ghc-mod.cabal
--- old/ghc-mod-5.6.0.0/ghc-mod.cabal 2016-07-29 15:18:31.000000000 +0200
+++ new/ghc-mod-5.7.0.0/ghc-mod.cabal 2017-01-16 23:17:09.000000000 +0100
@@ -1,5 +1,5 @@
Name: ghc-mod
-Version: 5.6.0.0
+Version: 5.7.0.0
Author: Kazu Yamamoto