dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 17:52:21 +00:00 · 2009-11-26 01:19:35 +00:00 · 2009-08-16 10:51:41 +00:00 · 2009-07-04 10:52:00 +00:00 · 2009-07-04 09:58:46 +00:00 · 2008-11-07 03:53:43 +00:00
3 changed files with 26 additions and 25 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: hugs98
-# $Id$
-NAME := hugs98
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/hugs98.spec
+++ b/hugs98.spec
@ -2,7 +2,7 @@

 Name:		hugs98
 Version:	2006.09
-Release:	4%{?dist}
+Release:	8%{?dist}
 Summary:	Haskell Interpreter

 Group:		Development/Languages
@ -23,7 +23,7 @@ BuildRequires:	libXmu-devel
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	openal-devel
+BuildRequires:	openal-soft-devel
 BuildRequires:	freealut-devel
 BuildRequires:	prelink

@ -106,9 +106,8 @@ Demo files for Hugs98.
 # this is to avoid network lookup of the DTD
 sed -i 's|\"http://www.oasis-open.org.*\"||' docs/users_guide/users_guide.xml

+
 %build
-OPTFLAGS=`echo %optflags | sed -e "s|-O2||"`
-%define optflags $OPTFLAGS
 %configure --with-pthreads --enable-char-encoding=locale
 make %{?_smp_mflags}

@ -193,7 +192,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hugs/packages/HGL


+%post
+update-alternatives --install %{_bindir}/runhaskell runhaskell \
+  %{_bindir}/runhugs 100
+update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
+  %{_bindir}/hsc2hs-hugs 100
+update-alternatives --install %{_bindir}/cpphs cpphs \
+  %{_bindir}/cpphs-hugs 100
+
+
+%preun
+if [ "$1" = 0 ]; then
+  update-alternatives --remove runhaskell %{_bindir}/runhugs
+  update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-hugs
+  update-alternatives --remove cpphs      %{_bindir}/cpphs-hugs
+fi
+
+
 %changelog
+* Sun Aug 16 2009 Gerard Milmeister <gemi@bluewin.ch> - 2006.09-8
+- rebuild against openal-soft
+
+* Fri Jul  3 2009 Gerard Milmeister <gemi@bluewin.ch> - 2006.09-6
+- added alternatives setup for runhaskell and friends
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2006.09-4
 - Autorebuild for GCC 4.3
Author	SHA1	Message	Date
Fedora Release Engineering	59a77bef19	dist-git conversion	2010-07-28 17:52:21 +00:00
Bill Nottingham	0d7ea60221	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:19:35 +00:00
Gérard Milmeister	e67a107315	rebuild against openal-soft	2009-08-16 10:51:41 +00:00
Gérard Milmeister	edc6eba806	* empty log message *	2009-07-04 10:52:00 +00:00
Gérard Milmeister	d152f06383	added alternatives setup for runhaskell and friends	2009-07-04 09:58:46 +00:00
Jesse Keating	b26f1bcde6	Initialize branch F-10 for hugs98	2008-11-07 03:53:43 +00:00