From 2ae4bd7b8bb9bc572e5a0650e12454b6468726c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sun, 29 Nov 2015 17:06:55 +0000 Subject: [PATCH] - update to 3.1.5 - drop alex-3.1.4-ghc-7.10.patch, merged by upstream * Generate less warning-laden code, and suppress other warnings. * Bug fixes. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/alex?expand=0&rev=45 --- alex-3.1.4-ghc-7.10.patch | 24 ------------------------ alex-3.1.4.tar.gz | 3 --- alex-3.1.5.tar.gz | 3 +++ alex.changes | 8 ++++++++ alex.spec | 6 ++---- 5 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 alex-3.1.4-ghc-7.10.patch delete mode 100644 alex-3.1.4.tar.gz create mode 100644 alex-3.1.5.tar.gz diff --git a/alex-3.1.4-ghc-7.10.patch b/alex-3.1.4-ghc-7.10.patch deleted file mode 100644 index cb422b6..0000000 --- a/alex-3.1.4-ghc-7.10.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/templates/wrappers.hs b/templates/wrappers.hs -index a1a1a6d..c020cc7 100644 ---- a/templates/wrappers.hs -+++ b/templates/wrappers.hs -@@ -284,6 +284,19 @@ runAlex input (Alex f) - - newtype Alex a = Alex { unAlex :: AlexState -> Either String (AlexState, a) } - -+instance Functor Alex where -+ fmap f a = Alex $ \s -> case unAlex a s of -+ Left msg -> Left msg -+ Right (s', a') -> Right (s', f a') -+ -+instance Applicative Alex where -+ pure a = Alex $ \s -> Right (s, a) -+ fa <*> a = Alex $ \s -> case unAlex fa s of -+ Left msg -> Left msg -+ Right (s', f) -> case unAlex a s' of -+ Left msg -> Left msg -+ Right (s'', b) -> Right (s'', f b) -+ - instance Monad Alex where - m >>= k = Alex $ \s -> case unAlex m s of - Left msg -> Left msg diff --git a/alex-3.1.4.tar.gz b/alex-3.1.4.tar.gz deleted file mode 100644 index b572458..0000000 --- a/alex-3.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f -size 101827 diff --git a/alex-3.1.5.tar.gz b/alex-3.1.5.tar.gz new file mode 100644 index 0000000..72e097d --- /dev/null +++ b/alex-3.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddadb06546c2d5677482a943ceefad6990936367712bf6e6ceae251163092210 +size 102419 diff --git a/alex.changes b/alex.changes index 7bd3966..850fd2d 100644 --- a/alex.changes +++ b/alex.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 29 17:05:31 UTC 2015 - mimi.vx@gmail.com + +- update to 3.1.5 +- drop alex-3.1.4-ghc-7.10.patch, merged by upstream +* Generate less warning-laden code, and suppress other warnings. +* Bug fixes. + ------------------------------------------------------------------- Wed May 13 09:19:35 UTC 2015 - mimi.vx@gmail.com diff --git a/alex.spec b/alex.spec index 01dc1b7..5877a55 100644 --- a/alex.spec +++ b/alex.spec @@ -20,7 +20,7 @@ %bcond_without tests Name: alex -Version: 3.1.4 +Version: 3.1.5 Release: 0 Summary: Tool for generating lexical analysers in Haskell License: BSD-3-Clause @@ -29,8 +29,6 @@ Group: Development/Languages/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM alex-3.1.4-ghc-7.10.patch -- fix for new prelude in ghc-7.10 -- Sergei Trofimovich -Patch0: alex-3.1.4-ghc-7.10.patch BuildRequires: autoconf BuildRequires: ghc-Cabal-devel @@ -39,6 +37,7 @@ BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros +BuildRequires: happy %description Alex is a tool for generating lexical analysers in Haskell. It takes a @@ -48,7 +47,6 @@ lex or flex for C/C++. %prep %setup -q -%patch0 -p1 %build %ghc_bin_build