rpms/hugs98/devel .cvsignore, 1.2, 1.3 hugs98.spec, 1.3, 1.4 sources, 1.2, 1.3

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17075

Modified Files:
	.cvsignore hugs98.spec sources 
Log Message:
new version 2006-05


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Apr 2006 08:25:46 -0000	1.2
+++ .cvsignore	20 Jun 2006 22:16:20 -0000	1.3
@@ -1 +1 @@
-hugs98-Mar2005-patched.tar.gz
+hugs98-plus-May2006.tar.gz


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	24 Apr 2006 11:08:51 -0000	1.3
+++ hugs98.spec	20 Jun 2006 22:16:20 -0000	1.4
@@ -1,15 +1,14 @@
-%define hugs_ver Mar2005-patched
+%define hugs_ver plus-May2006
 
 Name:		hugs98
-Version:	2005.03
-Release:	4%{?dist}
+Version:	2006.05
+Release:	1%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
-Patch0:		openal-1.0_1.2.patch
+Source0:	http://cvs.haskell.org/Hugs/downloads/2006-05/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -41,6 +40,16 @@
 OpenAL package for Hugs98.
 
 
+%package alut
+Summary:	ALUT package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-openal = %{version}-%{release}
+
+%description alut
+ALUT package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -92,13 +101,13 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
-%patch0 -p1
 
 
 %build
-%configure --with-pthreads
-touch src/stamp-h.in
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+OPTFLAGS=`echo %optflags | sed -e "s|-O2||"`
+%define optflags $OPTFLAGS
+%configure --with-pthreads --enable-char-encoding=utf8
+make %{?_smp_mflags}
 
 
 %install
@@ -111,6 +120,14 @@
 mv $RPM_BUILD_ROOT%{_libdir}/hugs/demos installed-demos
 rm installed-demos/Makefile.in
 
+mv $RPM_BUILD_ROOT%{_datadir}/hsc2hs-*/* $RPM_BUILD_ROOT%{_libdir}/hugs/programs/hsc2hs
+
+sed -i "s|^bindir.*|bindir=\"%{_bindir}\"|
+        s|^libdir.*|libdir=\"%{_libdir}/hugs/packages/hsc2hs|
+        s|^datadir.*|datadir=\"%{_libdir}/hugs/packages/hsc2hs\"|" \
+    $RPM_BUILD_ROOT%{_libdir}/hugs/programs/hsc2hs/Paths_hsc2hs.hs
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,6 +145,7 @@
 %{_bindir}/*
 %{_libdir}/hugs
 %exclude %{_libdir}/hugs/packages/OpenAL
+%exclude %{_libdir}/hugs/packages/ALUT
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -145,6 +163,11 @@
 %{_libdir}/hugs/packages/OpenAL
 
 
+%files alut
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/ALUT
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -166,6 +189,9 @@
 
 
 %changelog
+* Tue Jun 20 2006 Gerard Milmeister <gemi at bluewin.ch> - 2006.05-1
+- new version 2006.05 with libraries
+
 * Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
 - added patch provided by Jens Petersen to build OpenAL package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Apr 2006 08:25:46 -0000	1.2
+++ sources	20 Jun 2006 22:16:20 -0000	1.3
@@ -1 +1 @@
-f72c378251f0d488fff9871583d26843  hugs98-Mar2005-patched.tar.gz
+b6989dee41f818f5052d9d46e3663726  hugs98-plus-May2006.tar.gz