rpms/ghc/F-10 ghc.spec,1.48,1.49
Bryan O'Sullivan
bos at fedoraproject.org
Sun Oct 12 20:48:53 UTC 2008
- Previous message (by thread): rpms/gnomint/F-10 gnomint.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-CGI-SpeedyCGI/EL-4 perl-CGI-SpeedyCGI-2.22-c99_inline.patch, NONE, 1.1 perl-CGI-SpeedyCGI.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bos
Update of /cvs/extras/rpms/ghc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29380
Modified Files:
ghc.spec
Log Message:
Clean up dependencies and spec file
Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ghc.spec 12 Oct 2008 19:40:56 -0000 1.48
+++ ghc.spec 12 Oct 2008 20:48:23 -0000 1.49
@@ -16,7 +16,7 @@
Name: ghc
Version: 6.10.0.20081007
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64
@@ -26,17 +26,13 @@
Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
Source2: ghc-rpm-macros.ghc
URL: http://haskell.org/ghc/
-Requires: gcc, gmp-devel, readline-devel
+Requires: gcc, gmp-devel, libedit-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: ghc682, ghc681, ghc661, ghc66
+Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
BuildRequires: ghc, happy, sed
-BuildRequires: gmp-devel, readline-devel
-# X11 is no longer in ghc extralibs
-#BuildRequires: libX11-devel, libXt-devel
-BuildRequires: freeglut-devel, openal-devel
+BuildRequires: gmp-devel, libedit-devel
%if %{build_doc}
-# haddock generates docs in libraries, but haddock 2.0 is not compatible
-BuildRequires: libxslt, docbook-style-xsl, haddock09
+BuildRequires: libxslt, docbook-style-xsl
%endif
%description
@@ -98,8 +94,6 @@
echo "HADDOCK_DOCS = YES" >> mk/build.mk
%endif
-export HaddockCmd=%{_bindir}/haddock-0.9
-
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
@@ -199,6 +193,11 @@
%changelog
+* Sun Oct 12 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.0.20081007-2.fc10
+- Use libedit in preference to readline, for BSD license consistency
+- With haddock bundled now, obsolete standalone versions (but not haddock09)
+- Drop obsolete freeglut-devel, openal-devel, and haddock09 dependencies
+
* Sun Oct 12 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.0.20081007-1.fc10
- Update to 6.10.1 release candidate 1
- Previous message (by thread): rpms/gnomint/F-10 gnomint.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-CGI-SpeedyCGI/EL-4 perl-CGI-SpeedyCGI-2.22-c99_inline.patch, NONE, 1.1 perl-CGI-SpeedyCGI.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list