try dropping all haskeline, mtl, and terminfo to build
This commit is contained in:
parent
205495df99
commit
7b2f6a749e
23
ghc.spec
23
ghc.spec
@ -120,7 +120,7 @@ They should be installed when GHC's profiling subsystem is needed.
|
||||
# absolute haddock path (was for html/libraries -> libraries)
|
||||
%patch1 -p1 -b .orig
|
||||
# install more libs
|
||||
%patch2 -p1 -b .orig
|
||||
#%%patch2 -p1 -b .orig
|
||||
|
||||
# make sure we don't use these
|
||||
rm -r ghc-tarballs/{mingw,perl}
|
||||
@ -177,20 +177,20 @@ sed -i -e "s|\.%{_prefix}|%{_prefix}|" *.files
|
||||
cat rpm-lib-dir.files rpm-lib.files > ghc-libs.files
|
||||
cat rpm-dev-dir.files rpm-base.files > ghc.files
|
||||
|
||||
# subpackage ghc and extra libraries
|
||||
# subpackage ghc libraries
|
||||
sed -i -e "/ghc-%{version}\/ghc-%{version}/d" ghc.files ghc-libs.files
|
||||
sed -i -e "/ghc-%{version}-.*.conf\$/d" ghc.files
|
||||
sed -i -e "/ghc-%{version}\$/d" ghc-doc.files
|
||||
%ghc_gen_filelists ghc
|
||||
|
||||
for pkg in haskeline-0.6.2.1 terminfo-0.3.1.1; do
|
||||
sed -i -e "/ghc-%{version}\/$pkg/d" ghc.files ghc-libs.files
|
||||
sed -i -e "/$pkg-.*.conf\$/d" ghc.files
|
||||
sed -i -e "/$pkg\$/d" ghc-doc.files
|
||||
name=$(echo $pkg | sed -e "s/\(.*\)-.*/\1/")
|
||||
version=$(echo $pkg | sed -e "s/.*-\(.*\)/\1/")
|
||||
%ghc_gen_filelists ${name} ${version}
|
||||
done
|
||||
#for pkg in haskeline-0.6.2.1 terminfo-0.3.1.1; do
|
||||
# sed -i -e "/ghc-%{version}\/$pkg/d" ghc.files ghc-libs.files
|
||||
# sed -i -e "/$pkg-.*.conf\$/d" ghc.files
|
||||
# sed -i -e "/$pkg\$/d" ghc-doc.files
|
||||
# name=$(echo $pkg | sed -e "s/\(.*\)-.*/\1/")
|
||||
# version=$(echo $pkg | sed -e "s/.*-\(.*\)/\1/")
|
||||
# %%ghc_gen_filelists ${name} ${version}
|
||||
#done
|
||||
|
||||
# these are handled as alternatives
|
||||
for i in hsc2hs runhaskell; do
|
||||
@ -296,7 +296,8 @@ ghc-pkg recache
|
||||
|
||||
%changelog
|
||||
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 6.12.1-5
|
||||
- ghc-mtl package was added to fedora so dropping it from here
|
||||
- drop extras packages again (haskeline, mtl, and terminfo)
|
||||
- ghc-mtl package was added to fedora
|
||||
|
||||
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 6.12.1-4
|
||||
- ghc-rpm-macros-0.5.4 fixes wrong version requires between lib subpackages
|
||||
|
Loading…
Reference in New Issue
Block a user