diff --git a/alex-3.2.1.tar.gz b/alex-3.2.1.tar.gz deleted file mode 100644 index e716c2a..0000000 --- a/alex-3.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c -size 111167 diff --git a/alex-3.2.4.tar.gz b/alex-3.2.4.tar.gz new file mode 100644 index 0000000..0268401 --- /dev/null +++ b/alex-3.2.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d58e4d708b14ff332a8a8edad4fa8989cb6a9f518a7c6834e96281ac5f8ff232 +size 110688 diff --git a/alex.cabal b/alex.cabal deleted file mode 100644 index 20edeac..0000000 --- a/alex.cabal +++ /dev/null @@ -1,132 +0,0 @@ -name: alex -version: 3.2.1 -x-revision: 1 --- don't forget updating changelog.md! -license: BSD3 -license-file: LICENSE -copyright: (c) Chis Dornan, Simon Marlow -author: Chris Dornan and Simon Marlow -maintainer: Simon Marlow -bug-reports: https://github.com/simonmar/alex/issues -stability: stable -homepage: http://www.haskell.org/alex/ -synopsis: Alex is a tool for generating lexical analysers in Haskell -description: - Alex is a tool for generating lexical analysers in Haskell. - It takes a description of tokens based on regular - expressions and generates a Haskell module containing code - for scanning text efficiently. It is similar to the tool - lex or flex for C/C++. - -category: Development -cabal-version: >= 1.8 -build-type: Custom - -extra-source-files: - CHANGELOG.md - README.md - TODO - alex.spec - doc/Makefile - doc/aclocal.m4 - doc/alex.1.in - doc/alex.xml - doc/config.mk.in - doc/configure.ac - doc/docbook-xml.mk - doc/fptools.css - examples/Makefile - examples/Tokens.x - examples/Tokens_gscan.x - examples/Tokens_posn.x - examples/examples.x - examples/haskell.x - examples/lit.x - examples/pp.x - examples/state.x - examples/tiny.y - examples/words.x - examples/words_monad.x - examples/words_posn.x - src/Parser.y - src/Scan.hs - src/ghc_hooks.c - templates/GenericTemplate.hs - templates/wrappers.hs - tests/Makefile - tests/simple.x - tests/null.x - tests/tokens.x - tests/tokens_gscan.x - tests/tokens_posn.x - tests/tokens_bytestring.x - tests/tokens_posn_bytestring.x - tests/tokens_scan_user.x - tests/tokens_strict_bytestring.x - tests/tokens_monad_bytestring.x - tests/tokens_monadUserState_bytestring.x - tests/tokens_bytestring_unicode.x - tests/basic_typeclass.x - tests/basic_typeclass_bytestring.x - tests/default_typeclass.x - tests/gscan_typeclass.x - tests/posn_typeclass.x - tests/monad_typeclass.x - tests/monad_typeclass_bytestring.x - tests/monadUserState_typeclass.x - tests/monadUserState_typeclass_bytestring.x - tests/posn_typeclass_bytestring.x - tests/strict_typeclass.x - tests/unicode.x - -source-repository head - type: git - location: https://github.com/simonmar/alex.git - -flag small_base - description: Choose the new smaller, split-up base package. - -custom-setup - setup-depends: Cabal < 2.1, base < 5, filepath < 1.5, directory < 1.4 - -executable alex - hs-source-dirs: src - main-is: Main.hs - - if flag(small_base) - build-depends: base >= 2.1, array, containers, directory - else - build-depends: base >= 1.0 - - build-depends: base < 5 - -- build-depends: Ranged-sets - build-depends: QuickCheck >=2 - - extensions: CPP - ghc-options: -Wall -rtsopts - other-modules: - AbsSyn - CharSet - DFA - DFAMin - DFS - Info - Map - NFA - Output - Parser - ParseMonad - Scan - Set - Sort - Util - UTF8 - Data.Ranged - Data.Ranged.Boundaries - Data.Ranged.RangedSet - Data.Ranged.Ranges - -test-suite tests - type: exitcode-stdio-1.0 - main-is: test.hs - build-depends: base, process diff --git a/alex.changes b/alex.changes index c42bf50..707d849 100644 --- a/alex.changes +++ b/alex.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update alex to version 3.2.4. + * Remove dependency on QuickCheck + * Change the way that bootstrapping is done: see README.md for build + instructions + * fix issue when using cpphs (#116) + * Manage line length in generated files [GH-84] + * Fix issue when identifier with multiple single quotes, e.g. `foo''` was used + * Allow omitting spaces around `=` in macro definitions + * Include pre-generated Parser.hs and Scan.hs in the Hackage upload, to + make bootstrapping easier. + ------------------------------------------------------------------- Wed Aug 9 12:59:47 UTC 2017 - bwiedemann@suse.com diff --git a/alex.spec b/alex.spec index edb1c6e..3943d81 100644 --- a/alex.spec +++ b/alex.spec @@ -1,7 +1,7 @@ # # spec file for package alex # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,23 +16,19 @@ # -%bcond_without tests +%bcond_with tests Name: alex -Version: 3.2.1 +Version: 3.2.4 Release: 0 Summary: Alex is a tool for generating lexical analysers in Haskell License: BSD-3-Clause -Group: Development/Languages/Other -Url: https://hackage.haskell.org/package/%{name} +Group: Development/Libraries/Haskell +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/1.cabal#/%{name}.cabal -BuildRequires: autoconf BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros %if %{with tests} BuildRequires: ghc-process-devel @@ -46,29 +42,37 @@ lex or flex for C/C++. %prep %setup -q -cp -p %{SOURCE1} %{name}.cabal %build %ghc_bin_build -cd doc -test -f configure || autoreconf -# FIXME: you should use the %%configure macro -./configure %install %ghc_bin_install -mkdir -p %{buildroot}/%{_mandir}/man1 -cp doc/alex.1 %{buildroot}/%{_mandir}/man1 -rm doc/autom4te.cache/requests # varies across builds, breaking build-compare %check +# Ensure that the test suite can find the alex binary. +export PATH="%{buildroot}%{_bindir}:$PATH" %cabal_test %files -%doc LICENSE +%license LICENSE %doc CHANGELOG.md README.md TODO doc examples %{_bindir}/%{name} -%{_datadir}/%{name}-%{version} -%{_mandir}/man1/* +%dir %{_datadir}/%{name}-%{version} +%{_datadir}/%{name}-%{version}/AlexTemplate +%{_datadir}/%{name}-%{version}/AlexTemplate-debug +%{_datadir}/%{name}-%{version}/AlexTemplate-ghc +%{_datadir}/%{name}-%{version}/AlexTemplate-ghc-debug +%{_datadir}/%{name}-%{version}/AlexTemplate-ghc-nopred +%{_datadir}/%{name}-%{version}/AlexWrapper-basic +%{_datadir}/%{name}-%{version}/AlexWrapper-basic-bytestring +%{_datadir}/%{name}-%{version}/AlexWrapper-gscan +%{_datadir}/%{name}-%{version}/AlexWrapper-monad +%{_datadir}/%{name}-%{version}/AlexWrapper-monad-bytestring +%{_datadir}/%{name}-%{version}/AlexWrapper-monadUserState +%{_datadir}/%{name}-%{version}/AlexWrapper-monadUserState-bytestring +%{_datadir}/%{name}-%{version}/AlexWrapper-posn +%{_datadir}/%{name}-%{version}/AlexWrapper-posn-bytestring +%{_datadir}/%{name}-%{version}/AlexWrapper-strict-bytestring %changelog