SPECS: nhc98.spec - up to 1.18, new style bconds

[undefine]

Author: undefine                     Date: Mon Jul  4 00:28:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.18, new style bconds

---- Files affected:
SPECS:
   nhc98.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/nhc98.spec
diff -u SPECS/nhc98.spec:1.18 SPECS/nhc98.spec:1.19
--- SPECS/nhc98.spec:1.18	Wed May 11 16:32:23 2005
+++ SPECS/nhc98.spec	Mon Jul  4 02:28:36 2005
@@ -1,9 +1,7 @@
 # $Revision$, $Date$
-
-# _with_ghc	- build using ghc haskell compiler
-
-# _with_nhc	- build not using ghc haskell compiler, but nhc98
-#		  (slow compiler in effect)
+%bcond_with	ghc	# build using ghc haskell compiler
+%bcond_with	nhc	# build not using ghc haskell compiler, but nhc98 (slow compiler in effect)
+%bcond_with	java	# build with Java support
 
 # Due to nhc being old it does not build with new ghc, so default compiler
 # is now gcc
@@ -17,24 +15,24 @@
 Summary:	York compiler for Haskell 98
 Summary(pl):	Kompilator York do Haskella 98
 Name:		nhc98
-Version:	1.17
+Version:	1.18
 Release:	1
 License:	Free
 Group:		Development/Languages
 Source0:	ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/%{name}src-%{version}.tar.gz
-# Source0-md5:	a8ae8c0273cc8a881a527af4c7219847
+# Source0-md5:	f38b74481ec01a066cc9314b7bd18c90
 Patch0:		%{name}-termcap.patch
 Patch1:		%{name}-uname.patch
 Patch2:		%{name}-LP64.patch
 Patch3:		%{name}-alpha.patch
 URL:		http://www.cs.york.ac.uk/fp/nhc98/
 BuildRequires:	%{compiler}
-BuildRequires:	jdk
+%{?with_java:BuildRequires:	jdk}
 # for some tools
 BuildRequires:	gmp-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.213
-Requires:	jre
+%{?with_java:Requires:	jre}
 # this should be moved to subpackage
 Requires:	hmake
 Provides:	haskell
@@ -101,6 +99,7 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT INSTALL README docs_/docs
+%attr(755,root,root) %{_bindir}/cpphs
 %attr(755,root,root) %{_bindir}/*nhc98
 %attr(755,root,root) %{_bindir}/hood
 %attr(755,root,root) %{_bindir}/hp2graph
@@ -109,6 +108,8 @@
 %dir %{_libdir}/nhc98
 %dir %{_libdir}/nhc98/ix86-Linux
 %dir %{_libdir}/nhc98/*.jar
+%attr (755,root,root) %{_libdir}/nhc98/ix86-Linux/cpphs
+%attr (755,root,root) %{_libdir}/nhc98/ix86-Linux/hsc2hs
 %attr (755,root,root) %{_libdir}/nhc98/ix86-Linux/nhc98*
 %attr (755,root,root) %{_libdir}/nhc98/ix86-Linux/hmake*
 %attr (755,root,root) %{_libdir}/nhc98/ix86-Linux/greencard-nhc98
@@ -125,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2005/07/04 00:28:36  undefine
+- up to 1.18, new style bconds
+
 Revision 1.18  2005/05/11 14:32:23  qboosh
 - updated 64-bit archs list
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nhc98.spec?r1=1.18&r2=1.19&f=u