rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

BR redhat-rpm-config not ghc-rpm-macros; don't set without_hscolour in macros.ghc

Browse Source
This commit is contained in:
Jens Petersen 2012-10-25 18:13:54 +09:00
parent 4d0b6136b6
commit bda56fd9b1
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ghc-rpm-macros.spec
View File

@ -4,11 +4,9 @@
# uncomment to bootstrap without hscolour # uncomment to bootstrap without hscolour
#%%global without_hscolour 1 #%%global without_hscolour 1
# uncomment to unbootstrap hscolour on again
#%%undefine without_hscolour
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 0.97.2 Version: 0.97.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: Macros for building packages for GHC Summary: Macros for building packages for GHC
@ -27,8 +25,8 @@ 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} %if %{undefined without_hscolour}
BuildRequires: redhat-rpm-config
ExclusiveArch: %{ghc_arches} ExclusiveArch: %{ghc_arches}
BuildRequires: ghc-rpm-macros
Requires: hscolour Requires: hscolour
%endif %endif
@ -65,14 +63,6 @@ cat >> %{buildroot}/%{macros_file} <<EOF
EOF EOF
%endif %endif
%if %{defined without_hscolour}
cat >> %{buildroot}/%{macros_file} <<EOF
# bootstrap
%%without_hscolour 1
EOF
%endif
%files %files
%doc COPYING AUTHORS %doc COPYING AUTHORS
@ -82,6 +72,10 @@ EOF
%changelog %changelog
* Thu Oct 25 2012 Jens Petersen <petersen@redhat.com> - 0.97.3-1
- BR redhat-rpm-config instead of ghc-rpm-macros
- no longer set without_hscolour in macros.ghc for bootstrapping
* Tue Oct 9 2012 Jens Petersen <petersen@redhat.com> - 0.97.2-1 * Tue Oct 9 2012 Jens Petersen <petersen@redhat.com> - 0.97.2-1
- "cabal haddock" needs --html option with --hoogle to output html - "cabal haddock" needs --html option with --hoogle to output html