rpms/ghc/FC-5 ghc.spec,1.13,1.14

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682

Modified Files:
	ghc.spec 
Log Message:
sync with devel:
- buildrequire libXt-devel so that the X11 package and deps get built
  (Garrett Mitchener, #190201)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ghc.spec	22 Apr 2006 02:13:32 -0000	1.13
+++ ghc.spec	4 May 2006 09:37:00 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:		ghc
 Version:	6.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -15,9 +15,11 @@
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, sed
-Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+Buildrequires:  gmp-devel, readline-devel
+Buildrequires:  libX11-devel, libXt-devel
+Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
-# haddock generates libraries/ docs
+# haddock generates docs in libraries
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
 Prefix:		%{_prefix}
@@ -115,9 +117,11 @@
 cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
 %endif
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 ## tweak prefix in drivers scripts if relocating
 if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
@@ -125,6 +129,7 @@
   sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs}
 fi
 
+
 %post -n %{ghcver}
 ## tweak prefix in drivers scripts if relocating
 if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
@@ -133,29 +138,38 @@
   sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %exclude %{_bindir}/ghc*%{version}
 
+
 %files -n %{ghcver} -f rpm-base-filelist
 %defattr(-,root,root,-)
 %doc ghc/ANNOUNCE ghc/LICENSE ghc/README
 %{_bindir}/ghc*%{version}
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 
+
 %if %{build_prof}
 %files -n %{ghcver}-prof -f rpm-prof-filelist
 %defattr(-,root,root,-)
 %endif
 
+
 %if %{build_doc}
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
 %endif
 
+
 %changelog
+* Thu May  4 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-2.fc5
+- buildrequire libXt-devel so that the X11 package and deps get built
+  (Garrett Mitchener, #190201)
+
 * Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc5
 - update to 6.4.2 release
   - ghc-6.4.1-gcc41.patch no longer needed