rpms/ghc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix alternatives usage to follow Packaging:Alternatives (#753661)

Browse Source
This commit is contained in:
Jens Petersen 2011-11-14 19:29:08 +09:00
parent b24f66d05f
commit 72942f48a7
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ghc.spec
View File

@ -29,7 +29,7 @@ Version: 7.0.4
# - 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: 39%{?dist} Release: 40%{?dist}
Summary: Glasgow Haskell Compiler Summary: Glasgow Haskell Compiler
# fedora ghc has been bootstrapped on the following archs: # fedora ghc has been bootstrapped on the following archs:
#ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl
@ -108,6 +108,8 @@ License: BSD
Group: Development/Languages Group: Development/Languages
Requires: gcc Requires: gcc
Requires: ghc-base-devel Requires: ghc-base-devel
Requires(post): chkconfig
Requires(postun): chkconfig
# added in f14 # added in f14
Obsoletes: ghc-doc < 6.12.3-4 Obsoletes: ghc-doc < 6.12.3-4
# llvm is an optional dependency # llvm is an optional dependency
@ -283,6 +285,7 @@ for i in hsc2hs runhaskell; do
else else
mv ${RPM_BUILD_ROOT}%{_bindir}/$i{,-ghc} mv ${RPM_BUILD_ROOT}%{_bindir}/$i{,-ghc}
fi fi
touch ${RPM_BUILD_ROOT}%{_bindir}/$i
done done
%ghc_strip_dynlinked %ghc_strip_dynlinked
@ -346,7 +349,21 @@ fi
%files compiler %files compiler
%doc ANNOUNCE HACKING LICENSE README %doc ANNOUNCE HACKING LICENSE README
%{_bindir}/* %{_bindir}/ghc
%{_bindir}/ghc-%{version}
%{_bindir}/ghc-pkg
%{_bindir}/ghc-pkg-%{version}
%{_bindir}/ghci
%{_bindir}/ghci-%{version}
%{_bindir}/haddock
%{_bindir}/haddock-ghc-%{version}
%{_bindir}/hp2ps
%{_bindir}/hpc
%ghost %{_bindir}/hsc2hs-ghc
%{_bindir}/hsc2hs-ghc
%{_bindir}/runghc
%ghost %{_bindir}/runhaskell
%{_bindir}/runhaskell-ghc
%dir %{ghclibdir} %dir %{ghclibdir}
%{ghclibdir}/extra-gcc-opts %{ghclibdir}/extra-gcc-opts
%{ghclibdir}/ghc %{ghclibdir}/ghc
@ -395,6 +412,10 @@ fi
%files libraries %files libraries
%changelog %changelog
* Mon Nov 14 2011 Jens Petersen <petersen@redhat.com> - 7.0.4-40
- do alternatives handling correctly (reported by Giam Teck Choon, #753661)
see https://fedoraproject.org/wiki/Packaging:Alternatives
* Sat Nov 12 2011 Jens Petersen <petersen@redhat.com> - 7.0.4-39 * Sat Nov 12 2011 Jens Petersen <petersen@redhat.com> - 7.0.4-39
- move ghc-doc and ghc-libs obsoletes - move ghc-doc and ghc-libs obsoletes
- add HaskellReport license also to the base and libraries subpackages - add HaskellReport license also to the base and libraries subpackages