rpms/ghc/devel ghc.spec,1.48,1.49

Jens Petersen petersen at fedoraproject.org
Mon Oct 13 05:21:18 UTC 2008


Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29227

Modified Files:
	ghc.spec 
Log Message:
- provide haddock = 2.2.2
- add selinux file context for unconfined_execmem following darcs package
- post requires policycoreutils




Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ghc.spec	13 Oct 2008 03:05:05 -0000	1.48
+++ ghc.spec	13 Oct 2008 05:20:47 -0000	1.49
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.0.20081007
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -27,8 +27,11 @@
 Source2:	ghc-rpm-macros.ghc
 URL:		http://haskell.org/ghc/
 Requires:	gcc, gmp-devel, libedit-devel
+Requires(post): policycoreutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
+# introduced for f11 and to be removed for f13:
+Provides:       haddock = 2.2.2
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, libedit-devel
 %if %{build_doc}
@@ -138,13 +141,16 @@
 touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
 
 # these are handled as alternatives
-mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs-ghc
+mv ${RPM_BUILD_ROOT}%{_bindir}/hsc2hs{,-ghc}
 rm ${RPM_BUILD_ROOT}%{_bindir}/runhaskell
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+semanage fcontext -a -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/ghc >/dev/null 2>&1 || :
+restorecon %{_libdir}/ghc-%{version}/ghc >/dev/null
+
 # Alas, GHC, Hugs, and nhc all come with different set of tools in
 # addition to a runFOO:
 #
@@ -193,6 +199,11 @@
 
 
 %changelog
+* Mon Oct 13 2008 Jens Petersen <petersen at redhat.com> - 6.10.0.20081007-3
+- provide haddock = 2.2.2
+- add selinux file context for unconfined_execmem following darcs package
+- post requires policycoreutils
+
 * 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)




More information about the fedora-extras-commits mailing list