From 3c9c407cd981870dae1a979ab4c215710b516da0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Oct 13 2008 08:00:50 +0000 Subject: - revert back to ghc-6.8.3 for now - add selinux file context for unconfined_execmem following darcs package --- diff --git a/.cvsignore b/.cvsignore index 870e85c..245433c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -ghc-6.10.0.20081007-src.tar.bz2 -ghc-6.10.0.20081007-src-extralibs.tar.bz2 +ghc-6.8.3-src-extralibs.tar.bz2 +ghc-6.8.3-src.tar.bz2 diff --git a/ghc-6.8.3-libraries-config.patch b/ghc-6.8.3-libraries-config.patch new file mode 100644 index 0000000..451ced3 --- /dev/null +++ b/ghc-6.8.3-libraries-config.patch @@ -0,0 +1,22 @@ +--- ghc-6.8.3/libraries/Makefile~ 2008-06-17 23:10:28.000000000 -0700 ++++ ghc-6.8.3/libraries/Makefile 2008-06-17 23:21:21.000000000 -0700 +@@ -256,6 +256,8 @@ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ + --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ + --with-ld=$(LD) \ ++ --with-haddock=$(HADDOCK) \ ++ --with-happy=$(HAPPY) \ + --haddock-options="--use-contents=../index.html \ + --use-index=../doc-index.html" \ + $(FLAGGED_CONFIGURE_ARGS) \ +--- ghc-6.8.3/libraries/gen_contents_index~ 2008-06-18 20:40:39.000000000 -0700 ++++ ghc-6.8.3/libraries/gen_contents_index 2008-06-18 20:40:50.000000000 -0700 +@@ -22,7 +22,7 @@ + done + + # Now create the combined contents and index pages +-haddock --gen-index --gen-contents -o . \ ++haddock-0.9 --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + $HADDOCK_ARGS + diff --git a/ghc.spec b/ghc.spec index 8cfd531..b48b4a9 100644 --- a/ghc.spec +++ b/ghc.spec @@ -15,8 +15,8 @@ %define package_debugging 0 Name: ghc -Version: 6.10.0.20081007 -Release: 2%{?dist} +Version: 6.8.3 +Release: 7%{?dist} Summary: Glasgow Haskell Compilation system # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713 ExcludeArch: alpha ppc64 @@ -25,14 +25,18 @@ Group: Development/Languages 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 Source2: ghc-rpm-macros.ghc +Patch0: ghc-6.8.3-libraries-config.patch URL: http://haskell.org/ghc/ -Requires: gcc, gmp-devel, libedit-devel +Requires: gcc, gmp-devel, readline-devel +Requires(post): policycoreutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0 +Obsoletes: ghc682, ghc681, ghc661, ghc66 BuildRequires: ghc, happy, sed -BuildRequires: gmp-devel, libedit-devel +BuildRequires: gmp-devel, readline-devel +BuildRequires: freeglut-devel, openal-devel %if %{build_doc} -BuildRequires: libxslt, docbook-style-xsl +# haddock generates docs in libraries, but haddock 2.0 is not compatible +BuildRequires: libxslt, docbook-style-xsl, haddock09 %endif %description @@ -73,6 +77,7 @@ you like to have local access to the documentation in HTML format. %prep %setup -q -n %{name}-%{version} -b1 +%patch0 -p1 -b .0-haddock~ %build # hack for building a local test package quickly from a prebuilt tree @@ -94,6 +99,8 @@ echo "XMLDocWays = html" >> mk/build.mk 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} \ @@ -145,6 +152,9 @@ rm ${RPM_BUILD_ROOT}%{_bindir}/runhaskell rm -rf $RPM_BUILD_ROOT %post +semanage fcontext -a -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || : +restorecon %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} + # Alas, GHC, Hugs, and nhc all come with different set of tools in # addition to a runFOO: # @@ -193,17 +203,11 @@ fi %changelog -* Sun Oct 12 2008 Bryan O'Sullivan - 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 - 6.10.0.20081007-1.fc10 -- Update to 6.10.1 release candidate 1 +* Mon Oct 13 2008 Jens Petersen - 6.8.3-7.fc10 +- add selinux file context for unconfined_execmem following darcs package -* Wed Oct 1 2008 Bryan O'Sullivan - 6.10.0.20080921-1.fc10 -- Drop unneeded haddock patch -- Rename hsc2hs to hsc2hs-ghc so the alternatives symlink to it will work +* Wed Oct 1 2008 Bryan O'Sullivan 6.8.3-6.fc10 +* Rename hsc2hs to hsc2hs-ghc so the alternatives symlink to it will work * Wed Sep 24 2008 Jens Petersen - 6.8.3-5.fc10 - bring back including haddock-generated lib docs, now under docdir/ghc diff --git a/sources b/sources index f15cb81..cf8f101 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4350d1f8bea53f713732d10a7a9133f6 ghc-6.10.0.20081007-src.tar.bz2 -59136b86bafbdc4d32a645d3d7a8fa46 ghc-6.10.0.20081007-src-extralibs.tar.bz2 +5ac72f5d5433151cf6b718dc6601dc41 ghc-6.8.3-src-extralibs.tar.bz2 +dfa31028b4d06d1d226f55fe3a2ab7b3 ghc-6.8.3-src.tar.bz2