rpms/ghc/F-11 .cvsignore, 1.16, 1.17 ghc.spec, 1.81, 1.82 sources, 1.18, 1.19 ghc-mk-pkg-install-inplace.patch, 1.1, NONE ghc-rpm-macros.ghc, 1.14, NONE

Thu May 28 00:18:48 UTC 2009

Author: petersen

Update of /cvs/extras/rpms/ghc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10117

Modified Files:
	.cvsignore ghc.spec sources 
Removed Files:
	ghc-mk-pkg-install-inplace.patch ghc-rpm-macros.ghc 
Log Message:
backport ghc-6.10.3 to f11 from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17

--- .cvsignore	8 Apr 2009 20:56:33 -0000	1.16
+++ .cvsignore	28 May 2009 00:18:17 -0000	1.17
@@ -1,2 +1,2 @@
-ghc-6.10.2-src.tar.bz2
-ghc-6.10.2-src-extralibs.tar.bz2
+ghc-6.10.3-src.tar.bz2
+ghc-6.10.3-src-extralibs.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-11/ghc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- ghc.spec	2 May 2009 12:09:58 -0000	1.81
+++ ghc.spec	28 May 2009 00:18:17 -0000	1.82
@@ -1,11 +1,15 @@
 # test builds can made faster and smaller by disabling profiled libraries
+# (currently libHSrts_thr_p.a breaks no prof build)
 %bcond_without prof
 # build users_guide, etc
-%bcond_without doc
+%bcond_without manual
+# include extralibs
+%bcond_without extralibs
 
 # experimental
 ## shared libraries support available in ghc >= 6.11
 %bcond_with shared
+## include colored html src
 %bcond_with hscolour
 
 # Fixing packaging problems can be a tremendous pain because it
@@ -21,38 +25,38 @@
 %global package_debugging 0
 
 Name: ghc
-Version: 6.10.2
-Release: 5%{?dist}
+# part of haskell-platform
+Version: 6.10.3
+Release: 2%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
 License: BSD
 Group: Development/Languages
 Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+%if %{with extralibs}
 Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
-# /etc/rpm/macros.ghc
-Source2: ghc-rpm-macros.ghc
+%endif
 URL: http://haskell.org/ghc/
-# libedit-devel > 2.11-2 correctly requires ncurses-devel
-Requires: gcc, gmp-devel, libedit-devel > 2.11-2
+Requires: gcc, gmp-devel
 Requires(post): policycoreutils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0, haddock09
+Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock09
 # introduced for f11 and can be removed for f13:
-Provides: haddock = 2.3.0
+Obsoletes: haddock < 2.4.2
+Provides: haddock = 2.4.2
 BuildRequires: ghc, happy, sed
-BuildRequires: gmp-devel, libedit-devel > 2.11-2
+BuildRequires: gmp-devel
 %if %{with shared}
 # not sure if this is actually needed
 BuildRequires: libffi-devel
 %endif
-%if %{with doc}
+%if %{with manual}
 BuildRequires: libxslt, docbook-style-xsl
+%endif
 %if %{with hscolour}
 BuildRequires: hscolour
 %endif
-%endif
-Patch1: ghc-mk-pkg-install-inplace.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -104,10 +108,7 @@ Shared libraries for Glorious Glasgow Ha
 %global debug_package %{nil}
 
 %prep
-%setup -q -n %{name}-%{version} -b1
-%if %{with shared}
-%patch1 -p1 -b .orig-dist-install
-%endif
+%setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -119,17 +120,11 @@ popd
 exit 0
 %endif
 
-%ifarch ppc
-echo "GhcUnregisterised=YES" >> mk/build.mk
-echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-echo "SplitObjs=NO" >> mk/build.mk
-%endif
-
 %if %{without prof}
 echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk
 %endif
 
-%if %{with doc}
+%if %{with manual}
 echo "XMLDocWays   = html" >> mk/build.mk
 %endif
 
@@ -141,9 +136,8 @@ echo "XMLDocWays   = html" >> mk/build.m
   %{?with_shared:--enable-shared}
 
 make %{_smp_mflags}
-#make %{_smp_mflags} -C libraries
 
-%if %{with doc}
+%if %{with manual}
 make %{_smp_mflags} html
 %endif
 
@@ -152,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-%if %{with doc}
+%if %{with manual}
 make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
@@ -161,15 +155,11 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir
 echo %{_libdir}/%{name}-%{version} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
 %endif
 
-# install rpm macros
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
-cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
-
 SRC_TOP=$PWD
 rm -f rpm-*.files
 ( cd $RPM_BUILD_ROOT
   find .%{_libdir}/%{name}-%{version} \( -type d -fprintf $SRC_TOP/rpm-dir.files "%%%%dir %%p\n" \) -o \( -type f \( -name '*.p_hi' -o -name '*_p.a' \) -fprint $SRC_TOP/rpm-prof.files \) -o \( -not -name 'package.conf*' -fprint $SRC_TOP/rpm-lib.files \)
-  find .%{_docdir}/%{name}/* -type d ! -name libraries %{?with_hscolour:! -name src} > $SRC_TOP/rpm-doc-dir.files
+  find .%{_docdir}/%{name}/* -type d ! -name libraries ! -name src > $SRC_TOP/rpm-doc-dir.files
 )
 
 # make paths absolute (filter "./usr" to "/usr")
@@ -246,17 +236,16 @@ fi
 %defattr(-,root,root,-)
 %doc ANNOUNCE HACKING LICENSE README
 %{_bindir}/*
-%if %{with doc}
+%if %{with manual}
 %{_mandir}/man1/ghc.*
 %endif
-%{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 
 %files doc -f rpm-doc-dir.files
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/LICENSE
-%if %{with doc}
+%if %{with manual}
 %{_docdir}/%{name}/index.html
 %endif
 %{_docdir}/%{name}/libraries/gen_contents_index
@@ -283,8 +272,17 @@ fi
 %endif
 
 %changelog
-* Sat May  2 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-5
-- try unregisterised ppc to see if that stops the segfaulting with runghc
+* Fri May 22 2009 Jens Petersen <petersen at redhat.com> - 6.10.3-2
+- update haddock provides and obsoletes
+- drop ghc-mk-pkg-install-inplace.patch: no longer needed with new 6.11 buildsys
+- add bcond for extralibs
+- rename doc bcond to manual
+
+* Wed May 13 2009 Jens Petersen <petersen at redhat.com> - 6.10.3-1
+- update to 6.10.3
+- haskline replaces editline, so it is no longer needed to build
+- macros.ghc moved to ghc-rpm-macros package
+- fix handling of hscolor files in filelist generation
 
 * Tue Apr 28 2009 Jens Petersen <petersen at redhat.com> - 6.10.2-4
 - add experimental bcond hscolour


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	8 Apr 2009 20:56:33 -0000	1.18
+++ sources	28 May 2009 00:18:17 -0000	1.19
@@ -1,2 +1,2 @@
-243d5857e5aa5f2f86e5e4c4437973fb  ghc-6.10.2-src.tar.bz2
-9415604386ca69ebe15f1054653aefaf  ghc-6.10.2-src-extralibs.tar.bz2
+3de6a6d434c2b43def10c4cc613b265e  ghc-6.10.3-src.tar.bz2
+d0fe09625556ea274df11d601c1b2a15  ghc-6.10.3-src-extralibs.tar.bz2


--- ghc-mk-pkg-install-inplace.patch DELETED ---


--- ghc-rpm-macros.ghc DELETED ---


