From e6bc25d894d9720a7b6a8b0136ec573de8032275 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Oct 2009 08:45:50 +0000 Subject: [PATCH] - selinux file context no longer needed in post script - (for ghc-6.12-shared) drop ld.so.conf.d files -------------------------------------------------------------- --- ghc.spec | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/ghc.spec b/ghc.spec index 424ffc5..1351a0e 100644 --- a/ghc.spec +++ b/ghc.spec @@ -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 +- 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 - 6.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild