rpms/ghc/F-8 ghc.spec,1.32,1.33

Bryan O'Sullivan (bos) fedora-extras-commits at redhat.com
Mon Jan 7 21:03:50 UTC 2008


Author: bos

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

Modified Files:
	ghc.spec 
Log Message:
Resort to use of sed


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-8/ghc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ghc.spec	7 Jan 2008 18:24:30 -0000	1.32
+++ ghc.spec	7 Jan 2008 21:03:08 -0000	1.33
@@ -18,7 +18,7 @@
 
 Name:		ghc
 Version:	6.8.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -155,6 +155,10 @@
 # make paths absolute (filter "./usr" to "/usr")
 sed -i -e "s|\.%{_prefix}|%{_prefix}|" rpm-*.files
 
+# fix haddock directories
+sed -i -e 's,%{_docdir}/%{name}/,%{_docdir}/%{name}-%{version}/,g' \
+  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/package.conf
+
 cat rpm-dir.files rpm-lib.files > rpm-base-filelist
 %if %{build_prof}
 cat rpm-dir.files rpm-prof.files > rpm-prof-filelist




More information about the fedora-extras-commits mailing list