rpms/ghc/devel ghc.spec,1.33,1.34

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	ghc.spec 
Log Message:
- remove unrecognized --htmldir from configure
- drop old buildrequires on libX11-devel and libXt-devel



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ghc.spec	14 Feb 2008 08:11:43 -0000	1.33
+++ ghc.spec	14 Feb 2008 08:31:32 -0000	1.34
@@ -31,7 +31,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, readline-devel
-BuildRequires:  libX11-devel, libXt-devel
+# X11 is no longer in ghc extralibs
+#BuildRequires:  libX11-devel, libXt-devel
 BuildRequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
@@ -113,8 +114,7 @@
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
-  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
-  --htmldir=%{_docdir}/%{name}-%{version}
+  --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir}
 
 cat <<HADDOCK_PATH_HACK >> mk/build.mk
 docdir  := %{_docdir}/%{name}-%{version}
@@ -232,7 +232,8 @@
 
 %changelog
 * Thu Feb 14 2008 Jens Petersen <petersen at redhat.com> - 6.8.2-9
-- remove unrecognized --docdir from configure
+- remove unrecognized --docdir and --htmldir from configure
+- drop old buildrequires on libX11-devel and libXt-devel
 - rebuild with gcc43
 
 * Sun Jan 06 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.8.2-7