rpms/ghc/devel ghc.spec,1.96,1.97

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc.spec 
Log Message:
- selinux file context no longer needed in post script
- (for ghc-6.12-shared) drop ld.so.conf.d files

--------------------------------------------------------------



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ghc.spec	28 Sep 2009 05:39:09 -0000	1.96
+++ ghc.spec	1 Oct 2009 08:45:50 -0000	1.97
@@ -127,11 +127,11 @@ exit 0
 %endif
 
 %if %{without prof}
-echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk
+echo "GhcLibWays = %{?with_shared:dyn}" >> mk/build.mk
 %endif
 
 %if %{with manual}
-echo "XMLDocWays   = html" >> mk/build.mk
+echo "XMLDocWays = html" >> mk/build.mk
 %endif
 
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
@@ -156,11 +156,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
-%if %{with shared}
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name}-%{version} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
-%endif
-
 SRC_TOP=$PWD
 rm -f rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -200,9 +195,6 @@ rm testghc/*
 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
-
 # Alas, GHC, Hugs, and nhc all come with different set of tools in
 # addition to a runFOO:
 #
@@ -265,19 +257,16 @@ fi
 %ghost %{_docdir}/%{name}/libraries/minus.gif
 %ghost %{_docdir}/%{name}/libraries/plus.gif
 
-%if %{with shared}
-%files libs
-%defattr(-,root,root,-)
-%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
-%{_libdir}/libHS*-ghc%{version}.so
-%endif
-
 %if %{with prof}
 %files prof -f rpm-prof.files
 %defattr(-,root,root,-)
 %endif
 
 %changelog
+* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com>
+- selinux file context no longer needed in post script
+- (for ghc-6.12-shared) drop ld.so.conf.d files
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild