rpms/ghc/F-8 ghc.spec,1.25,1.26

[Bryan O'Sullivan (bos)]

Author: bos

Update of /cvs/extras/rpms/ghc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725

Modified Files:
	ghc.spec 
Log Message:
Drop bit-rotted attempts at making package relocatable


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-8/ghc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ghc.spec	5 Nov 2007 05:51:00 -0000	1.25
+++ ghc.spec	9 Nov 2007 04:11:40 -0000	1.26
@@ -18,7 +18,7 @@
 
 Name:		ghc
 Version:	6.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	ppc64
@@ -162,12 +162,6 @@
 
 
 %post
-## tweak prefix in drivers scripts if relocating
-if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
-  BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  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 || :
 
 # Alas, GHC, Hugs, and nhc all come with different set of tools in
@@ -188,13 +182,6 @@
   %{_bindir}/hsc2hs-ghc 500
 
 %post -n %{ghcver}
-## tweak prefix in drivers scripts if relocating
-if [ "${RPM_INSTALL_PREFIX}" != "%{_prefix}" ]; then
-  BINDIR=`echo %{_bindir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  LIBDIR=`echo %{_libdir} | sed -e "s|%{_prefix}|${RPM_INSTALL_PREFIX}|"`
-  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 || :
 
 
@@ -234,6 +221,9 @@
 
 
 %changelog
+* Thu Nov  8 2007 Bryan O'Sullivan <bos at serpentine.com> - 6.8.1-2
+- Drop bit-rotted attempts at making package relocatable
+
 * Sun Nov  4 2007 Michel Salim <michel.sylvan at gmail.com> - 6.8.1-1
 - Update to 6.8.1