From 40bffeb7a320be13d0eea2134d87bbc7808c66f7 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Wed, 6 Jun 2012 18:14:27 +0000 Subject: [PATCH] Accepting request 123939 from home:ptrommler:haskell-platform Haskell Platform 2012.2.0.0 OBS-URL: https://build.opensuse.org/request/show/123939 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/alex?expand=0&rev=30 --- _service:download_files:alex-2.3.5.tar.gz | 3 --- _service:download_files:alex-3.0.1.tar.gz | 3 +++ alex-2.3.5-generate-man-page.patch | 10 -------- alex.changes | 30 +++++++++++++++++++++++ alex.spec | 16 +++--------- 5 files changed, 37 insertions(+), 25 deletions(-) delete mode 100644 _service:download_files:alex-2.3.5.tar.gz create mode 100644 _service:download_files:alex-3.0.1.tar.gz delete mode 100644 alex-2.3.5-generate-man-page.patch diff --git a/_service:download_files:alex-2.3.5.tar.gz b/_service:download_files:alex-2.3.5.tar.gz deleted file mode 100644 index 82f46cf..0000000 --- a/_service:download_files:alex-2.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ea6d30b98881c0fd57bfafae024050cd98dc5b0140d64a6d722c64a098ed253 -size 79147 diff --git a/_service:download_files:alex-3.0.1.tar.gz b/_service:download_files:alex-3.0.1.tar.gz new file mode 100644 index 0000000..5d25360 --- /dev/null +++ b/_service:download_files:alex-3.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:727235cee46396537c2b53b4a0fae0ec25cffb9e982ce899816e92fcfe4cfaf0 +size 100057 diff --git a/alex-2.3.5-generate-man-page.patch b/alex-2.3.5-generate-man-page.patch deleted file mode 100644 index 26aa6fd..0000000 --- a/alex-2.3.5-generate-man-page.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Nur alex-2.3.5/doc/configure.ac alex-2.3.5-man/doc/configure.ac ---- alex-2.3.5/doc/configure.ac 2010-11-26 11:44:56.000000000 +0100 -+++ alex-2.3.5-man/doc/configure.ac 2012-05-07 20:29:05.000000000 +0200 -@@ -9,5 +9,5 @@ - - AC_PATH_PROG(DbLatexCmd,dblatex) - --AC_CONFIG_FILES([config.mk]) -+AC_CONFIG_FILES([config.mk alex.1]) - AC_OUTPUT diff --git a/alex.changes b/alex.changes index 47af053..e902f4d 100644 --- a/alex.changes +++ b/alex.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Jun 4 06:59:04 UTC 2012 - peter.trommler@ohm-hochschule.de + +- update to 3.0.1 from upstream + * Unicode support (contributed mostly by Jean-Philippe Bernardy, + with help from Alan Zimmerman). + + * An Alex lexer now takes a UTF-8 encoded byte sequence as input + (see Section 5.1, “Unicode and UTF-8”. If you are using the + "basic" wrapper or one of the other wrappers that takes a + Haskell String as input, the string is automatically encoded + into UTF-8 by Alex. If your input is a ByteString, you are + responsible for ensuring that the input is UTF-8 encoded. The + old 8-bit behaviour is still available via the --latin1 + option. + + * Alex source files are asumed to be in UTF-8, like Haskell + source files. The lexer specification can use Unicode + characters and ranges. + + * alexGetChar is renamed to alexGetByte in the generated code. + + * There is a new option, --latin1, that restores the old + behaviour. + + * Alex now does DFA minimization, which helps to reduce the size + of the generated tables, especially for lexers that use Unicode. +- dropped patch alex-2.3.5-generate-man-page.patch +- required by Haskell Platform 2012.2.0.0 + ------------------------------------------------------------------- Mon May 7 18:40:00 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/alex.spec b/alex.spec index daf07ad..e3e892a 100644 --- a/alex.spec +++ b/alex.spec @@ -17,28 +17,23 @@ # Name: alex -Version: 2.3.5 +Version: 3.0.1 Release: 0 Summary: Tool for generating lexical analysers in Haskell Group: Development/Languages/Other License: BSD-3-Clause +BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM alex-2.3.5-generate-man-page.patch -- fixed in 3.0.1 -Patch: alex-2.3.5-generate-man-page.patch ExclusiveArch: %{ix86} x86_64 %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# END cabal2spec -# list ghc-*-devel dependencies: BuildRequires: ghc-QuickCheck-devel BuildRequires: autoconf +# END cabal2spec -%if %{defined sles_version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif %description Tool for generating lexical analysers in Haskell similar to lex @@ -46,7 +41,6 @@ Tool for generating lexical analysers in Haskell similar to lex %prep %setup -q -%patch -p1 %build @@ -64,12 +58,10 @@ cp doc/alex.1 %{buildroot}/%{_mandir}/man1 %files %defattr(-,root,root,-) -%doc LICENSE +%doc LICENSE ANNOUNCE README TODO %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %{_mandir}/man1/* %changelog -* Sat Oct 8 2011 Fedora Haskell SIG - 3.0.1-0 -- initial packaging for Fedora automatically generated by cabal2spec-0.24.1