rpms/ghc/FC-6 .cvsignore, 1.6, 1.7 ghc.spec, 1.16, 1.17 sources, 1.8, 1.9

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
sync with devel:
- update to 6.6 release
- buildrequire haddock >= 0.8
- fix summary of ghcver package (Michel Salim, #209574)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2006 07:59:27 -0000	1.6
+++ .cvsignore	9 Nov 2006 03:30:56 -0000	1.7
@@ -1 +1,2 @@
-ghc-6.4.2-src.tar.bz2
+ghc-6.6-src.tar.bz2
+ghc-6.6-src-extralibs.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/ghc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ghc.spec	28 Sep 2006 01:44:23 -0000	1.16
+++ ghc.spec	9 Nov 2006 03:30:56 -0000	1.17
@@ -1,16 +1,17 @@
-%define ghcver ghc642
+%define ghcver ghc66
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.2
-Release:	4%{?dist}
+Version:	6.6
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
-Source:		http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +21,7 @@
 Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
-Buildrequires: libxslt, docbook-style-xsl, haddock
+Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
 Prefix:		%{_prefix}
 
@@ -35,7 +36,7 @@
 interface.
 
 %package -n %{ghcver}
-Summary:	Documentation for GHC
+Summary:	Glasgow Haskell Compilation system
 Group:		Development/Languages
 Requires:	gcc gmp-devel readline-devel
 
@@ -79,7 +80,7 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
-%setup -q -n ghc-%{version}
+%setup -q -n ghc-%{version} -b1
 
 %build
 %if !%{build_prof}
@@ -154,7 +155,7 @@
 
 %files -n %{ghcver} -f rpm-base-filelist
 %defattr(-,root,root,-)
-%doc ghc/ANNOUNCE ghc/LICENSE ghc/README
+%doc ANNOUNCE HACKING LICENSE README
 %{_bindir}/ghc*%{version}
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
@@ -174,6 +175,11 @@
 
 
 %changelog
+* Thu Nov  9 2006 Jens Petersen <petersen at redhat.com> - 6.6-1
+- update to 6.6 release
+- buildrequire haddock >= 0.8
+- fix summary of ghcver package (Michel Salim, #209574)
+
 * Thu Sep 28 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-4
 - turn on docs generation again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 12:34:59 -0000	1.8
+++ sources	9 Nov 2006 03:30:56 -0000	1.9
@@ -1 +1,2 @@
-a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2
+2427a8d7d14f86e0878df6b54938acf7  ghc-6.6-src.tar.bz2
+14b22fce36caffa509046361724bc119  ghc-6.6-src-extralibs.tar.bz2