ghc-rpm-macros now requires hscolour so packages no longer need to BR it
- this can be disabled for bootstrapping by setting without_hscolour
This commit is contained in:
parent
befa5e103e
commit
b95424a06b
@ -2,8 +2,11 @@
|
|||||||
|
|
||||||
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
%global macros_file %{_sysconfdir}/rpm/macros.ghc
|
||||||
|
|
||||||
|
# uncomment to bootstrap without hscolour
|
||||||
|
#%%global without_hscolour 1
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 0.96
|
Version: 0.97
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Macros for building packages for GHC
|
Summary: Macros for building packages for GHC
|
||||||
|
|
||||||
@ -21,6 +24,11 @@ Source2: AUTHORS
|
|||||||
Source3: ghc-deps.sh
|
Source3: ghc-deps.sh
|
||||||
Source4: cabal-tweak-dep-ver
|
Source4: cabal-tweak-dep-ver
|
||||||
Requires: redhat-rpm-config
|
Requires: redhat-rpm-config
|
||||||
|
%if %{undefined without_hscolour}
|
||||||
|
ExclusiveArch: %{ghc_arches}
|
||||||
|
BuildRequires: ghc-rpm-macros, hscolour
|
||||||
|
Requires: hscolour
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A set of macros for building GHC packages following the Haskell Guidelines
|
A set of macros for building GHC packages following the Haskell Guidelines
|
||||||
@ -55,6 +63,12 @@ cat >> %{buildroot}/%{macros_file} <<EOF
|
|||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{defined without_hscolour}
|
||||||
|
cat >> %{buildroot}/%{macros_file} <<EOF
|
||||||
|
|
||||||
|
# bootstrap
|
||||||
|
%%without_hscolour 1
|
||||||
|
EOF
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc COPYING AUTHORS
|
%doc COPYING AUTHORS
|
||||||
@ -64,6 +78,10 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Sep 8 2012 Jens Petersen <petersen@redhat.com> - 0.97-1
|
||||||
|
- ghc-rpm-macros now requires hscolour so packages no longer need to BR it
|
||||||
|
- this can be disabled for bootstrapping by setting without_hscolour
|
||||||
|
|
||||||
* Fri Aug 24 2012 Jens Petersen <petersen@redhat.com> - 0.96-1
|
* Fri Aug 24 2012 Jens Petersen <petersen@redhat.com> - 0.96-1
|
||||||
- make haddock build hoogle files
|
- make haddock build hoogle files
|
||||||
- Fedora ghc-7.4.2 Cabal will not build ghci lib files by default
|
- Fedora ghc-7.4.2 Cabal will not build ghci lib files by default
|
||||||
|
Loading…
Reference in New Issue
Block a user