X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.spec.in;h=5609612a7691e0315b51d2d24b21b5d9baa1925d;hb=a180ee15dfe2eb0da03cd92ca89475765cd080d9;hp=41664345e8ae32dc47326f407fe2967210e2098d;hpb=8d5271298d2edda571280af3bd9c4b327e981e01;p=ghc-hetmet.git

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index 4166434..5609612 100644
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -54,6 +54,9 @@ They should be installed when GHC's profiling subsystem is needed.
 
 %changelog
 
+* Thu Jun 22 2000 Sven Panne
+- removed explicit usage of hslibs/docs, it belongs to ghc/docs/set
+
 * Sun Apr 23 2000 Manuel Chakravarty
 - revised for ghc 4.07; added suggestions from Pixel <pixel@mandrakesoft.com>
 - added profiling package
@@ -102,12 +105,11 @@ make -C glafp-utils sgmlverb
 make all
 make -C docs ps html
 make -C ghc/docs ps html
-make -C hslibs/doc ps html
 
 %install
 # compress the non-html docs
 #
-for j in docs ghc/docs hslibs/doc; do
+for j in docs ghc/docs; do
   dir=`pwd`
   cd $j
   for i in ps dvi sgml vsgml verb idx; do
@@ -122,16 +124,27 @@ make prefix=$RPM_BUILD_ROOT%{prefix}\
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
 #
-find $RPM_BUILD_ROOT%{prefix}/lib\
-  ! -type d ! -name '*.p_hi' ! -name '*_p.a' -print >rpm-noprof-lib-files
+# * generating file lists in a BUILD_ROOT spec is a bit tricky: the file list
+#   has to contain complete paths, _but_ without the BUILD_ROOT, we also do
+#   _not_ want have directory names in the list; furthermore, we have to make
+#   sure that any leading / is removed from %{prefix}/lib, as find has to 
+#   interpret the argument as a relative path; however, we have to include the
+#   leading / again in the final file list (otherwise, rpm complains)
+# * isn't there an easier way to do all this?
+#
+dir=`pwd`
+cd $RPM_BUILD_ROOT
+libdir=`echo %{prefix}/lib | sed 's|^/||'`
+find $libdir ! -type d ! -name '*.p_hi' ! -name '*_p.a' -print | sed 's|^|/|'\
+     >$dir/rpm-noprof-lib-files
+cd $dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f rpm-noprof-lib-files
-%doc docs/ CONTRIB/
-%doc ghc/ANNOUNCE ghc/PATCHLEVEL ghc/README ghc/docs/
-%doc hslibs/doc/
+%doc docs/
+%doc ghc/ANNOUNCE ghc/README ghc/docs/
 %{prefix}/bin/*
 
 %files prof