- 1.16

- Updated BR, description, files list etc.

Changed files:
    happy.spec -> 1.30

diff --git a/happy.spec b/happy.spec
index 68205dc34a1a13d6b579fca208f73af8feae883c..53e2eeab9c06a9b4540e216852019f5bd2acebb2 100644 (file)
--- a/happy.spec
+++ b/happy.spec
@@ -5,80 +5,85 @@
 Summary:       Yacc-like LALR(1) Parser Generator for Haskell
 Summary(pl.UTF-8):     Generator parserów LALR(1) w stylu yacc-a dla Haskella
 Name:          happy
-Version:       1.15
-Release:       2
-License:       BSD w/o adv. clause
-Group:         Development/Languages
+Version:       1.16
+Release:       1
+License:       BSD-like w/o adv. clause
+Group:         Development/Tools
+Source0:       http://haskell.org/happy/dist/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: b9fd2f5eba61974dab8e12873cadee6f
 URL:           http://haskell.org/happy/
-Source0:       http://haskell.org/happy/dist/%{version}/%{name}-%{version}-src.tar.gz
-# Source0-md5: 02ceb122b904fa4a4290e6ea1072d59e
-Patch0:                %{name}-arch.patch
 BuildRequires: autoconf
-BuildRequires: automake
-%{!?with_bootstrap:BuildRequires:      ghc}
+BuildRequires: docbook-dtd42-xml
+BuildRequires: docbook-style-xsl
+%{!?with_bootstrap:BuildRequires:      ghc >= 6.6}
 BuildRequires: gmp-devel
-BuildRequires: jadetex
-BuildRequires: elfutils-libelf
-BuildRequires: ncurses-devel
-BuildRequires: openjade
-BuildRequires: readline-devel
-BuildRequires: sgml-common
-BuildRequires: tetex-dvips
+BuildRequires: libxslt-progs
+#For generating documentation in PDF: fop or xmltex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Happy is a LALR(1) parser generator for Haskell - similar to yacc for
-C. It generates a Haskell parser from an annotated BNF specification
-of a grammar. Happy allows to have several Happy generated parsers in
-one program.
+Happy is a parser generator system for Haskell, similar to the tool
+‘yacc’ for C. Like ‘yacc’, it takes a file containing an annotated BNF
+specification of a grammar and produces a Haskell module containing a
+parser for the grammar.
+
+Happy is flexible: you can have several Happy parsers in the same
+program, and several entry points to a single grammar. Happy can work
+in conjunction with a lexical analyser supplied by the user (either
+hand-written or generated by another program), or it can parse a
+stream of characters directly (but this isn't practical in most
+cases).
+
+Authors:
+--------
+    Simon Marlow <simonmar@microsoft.com>
+    Andy Gill <andy@galconn.com>
 
 %description -l pl.UTF-8
-Happy jest generatorem parserów LALR(1) dla Haskella - podobnym do
-yacc-a dla C. Generuje parser w Haskellu ze specyfikacji gramatyki w
-notacji BNF. Happy pozwala mieć wiele wygenerowanych parserów w jednym
-programie.
+Happy to system generatorów parserów dla Haskella, podobny do
+narzędzia yacc dla C. Na podstawie specyfikacji gramatyki w notacji
+BNF generuje moduł w Haskellu zawierający parser tej gramatyki.
+
+Happy jest elastyczny: można mieć kilka parserów wygenerowanych przez
+Happy w jednym programie tudzież kilka symboli startowych dla tej
+samej gramatyki. Happy może współpracować z analizatorem leksykalnym
+dostarczonym przez programistę (napisanym ręcznie albo wygenerowanym
+przez inny program), może też parsować strumień znaków bezpośrednio
+(co zwykle jest mniej praktyczne).
+
+Autorzy:
+--------
+    Simon Marlow <simonmar@microsoft.com>
+    Andy Gill <andy@galconn.com>
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
-%{__autoconf}
-%configure \
-       --with-gcc="%{__cc}"
+%{?with_bootstrap:PATH=$PATH:/usr/local/bin}
+runhaskell Setup.lhs configure --prefix=%{_prefix}
+runhaskell Setup.lhs build
 
-%{__make} -C glafp-utils sgmlverb mkdirhier all
-%{__make} -C happy/src depend
-%{__make} -C happy all
-%{__make} -C happy/doc html
+cd doc
+%{__autoconf}
+%configure
+%{__make} html
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_examplesdir}/happy}
-
-%{__make} install \
-       bindir=$RPM_BUILD_ROOT%{_bindir} \
-       libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}
-
-cp -a happy/examples/* $RPM_BUILD_ROOT%{_examplesdir}/happy/
+%{?with_bootstrap:PATH=$PATH:/usr/local/bin}
+runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT
 
-sed -e 's,@LIBDIR@,%{_libdir}/%{name}-%{version},g' \
-       -e 's,@DOCDIR@,%{_docdir}/%{name}-%{version},g' \
-       -e 's,@VERSION@,%{version},g' \
-       happy/doc/happy.1.in > $RPM_BUILD_ROOT%{_mandir}/man1/happy.1
-ln -sf happy-%{version} $RPM_BUILD_ROOT%{_bindir}/happy
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc happy/README happy/doc/happy
+%doc ANNOUNCE CHANGES README TODO doc/happy
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}-%{version}
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/happy.bin
-%{_libdir}/%{name}-%{version}/Happy*
-%{_libdir}/%{name}-%{version}/GLR*
-%{_mandir}/man1/*
-%{_examplesdir}/%{name}
+%{_datadir}/%{name}-%{version}
+%{_examplesdir}/%{name}-%{version}