rpms/ghc/devel ghc.spec,1.13,1.14

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19236

Modified Files:
	ghc.spec 
Log Message:
- ghost package.conf.old (Gérard Milmeister)
- set unconfined_execmem_exec_t context on executables with ghc rts (#195821)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ghc.spec	29 Apr 2006 07:33:52 -0000	1.13
+++ ghc.spec	25 Sep 2006 10:05:59 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name:		ghc
 Version:	6.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -117,9 +117,14 @@
 cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
 %endif
 
+# create package.conf.old
+touch $RPM_BUILD_ROOT%{_libdir}/ghc-%{version}/package.conf.old
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 ## tweak prefix in drivers scripts if relocating
 if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
@@ -127,6 +132,9 @@
   sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/{ghcprof,hsc2hs}
 fi
 
+/usr/bin/chcon -t unconfined_execmem_exec_t %{_bindir}/{hasktags,runghc,runhaskell} >/dev/null 2>&1 || :
+
+
 %post -n %{ghcver}
 ## tweak prefix in drivers scripts if relocating
 if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
@@ -135,29 +143,41 @@
   sed -i "s|%{_prefix}|${RPM_INSTALL_PREFIX}|" ${BINDIR}/ghc*-%{version} ${LIBDIR}/ghc-%{version}/package.conf
 fi
 
+/usr/bin/chcon -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/{ghc-%{version},ghc-pkg.bin,hsc2hs-bin} >/dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %exclude %{_bindir}/ghc*%{version}
 
+
 %files -n %{ghcver} -f rpm-base-filelist
 %defattr(-,root,root,-)
 %doc ghc/ANNOUNCE ghc/LICENSE ghc/README
 %{_bindir}/ghc*%{version}
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
+%ghost %{_libdir}/ghc-%{version}/package.conf.old
+
 
 %if %{build_prof}
 %files -n %{ghcver}-prof -f rpm-prof-filelist
 %defattr(-,root,root,-)
 %endif
 
+
 %if %{build_doc}
 %files doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
 %endif
 
+
 %changelog
+* Mon Sep 25 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-3.fc6
+- ghost package.conf.old (Gérard Milmeister)
+- set unconfined_execmem_exec_t context on executables with ghc rts (#195821)
+
 * Sat Apr 29 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-2.fc6
 - buildrequire libXt-devel so that the X11 package and deps get built
   (Garrett Mitchener, #190201)