rpms/ghc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

bring back LICENSE files to library subpackages and drop ghc_reindex_haddock

Browse Source
This commit is contained in:
Jens Petersen 2011-03-29 11:51:29 +09:00
parent 00673ae358
commit 573d38cfd0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghc.spec
View File

@ -31,7 +31,7 @@ Version: 7.0.2
# - release can only be reset if all library versions get bumped simultaneously # - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release) # (eg for a major release)
# - minor release numbers should be incremented monotonically # - minor release numbers should be incremented monotonically
Release: 13%{?dist} Release: 14%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs: # fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9
@ -145,7 +145,7 @@ They should be installed when GHC's profiling subsystem is needed.
# disable gen_contents_index when not --batch for cron # disable gen_contents_index when not --batch for cron
%patch3 -p1 %patch3 -p1
# use system libraries # make sure we don't use these
rm -r ghc-tarballs/{mingw,perl} rm -r ghc-tarballs/{mingw,perl}
# use system libffi # use system libffi
%if %{with libffi} %if %{with libffi}
@ -201,6 +201,7 @@ for i in %{ghc_packages_list}; do
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/") name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/") ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
%ghc_gen_filelists $name $ver %ghc_gen_filelists $name $ver
echo "%doc libraries/$name/LICENSE" >> ghc-$name%{?ghc_without_shared:-devel}.files
done done
%ghc_gen_filelists bin-package-db 0.0.0.0 %ghc_gen_filelists bin-package-db 0.0.0.0
@ -255,7 +256,7 @@ mkdir testghc
echo 'main = putStrLn "Foo"' > testghc/foo.hs echo 'main = putStrLn "Foo"' > testghc/foo.hs
inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo inplace/bin/ghc-stage2 testghc/foo.hs -o testghc/foo
[ "$(testghc/foo)" = "Foo" ] [ "$(testghc/foo)" = "Foo" ]
# don't seem to work inplace: # doesn't seem to work inplace:
#[ "$(inplace/bin/runghc testghc/foo.hs)" = "Foo" ] #[ "$(inplace/bin/runghc testghc/foo.hs)" = "Foo" ]
rm testghc/* rm testghc/*
echo 'main = putStrLn "Foo"' > testghc/foo.hs echo 'main = putStrLn "Foo"' > testghc/foo.hs
@ -299,7 +300,6 @@ fi
%posttrans %posttrans
# (posttrans to make sure any old libs and docs have been removed first) # (posttrans to make sure any old libs and docs have been removed first)
%ghc_pkg_recache %ghc_pkg_recache
%ghc_reindex_haddock
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -359,6 +359,10 @@ fi
%endif %endif
%changelog %changelog
* Tue Mar 29 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-14
- fix back missing LICENSE files in library subpackages
- drop ghc_reindex_haddock from install script
* Thu Mar 10 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-13 * Thu Mar 10 2011 Jens Petersen <petersen@redhat.com> - 7.0.2-13
- rebuild against 7.0.2 - rebuild against 7.0.2