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

also make %ghc_lib_build docdir unversioned

Browse Source 
require redhat-rpm-config >= 9.1.0-50.fc20
This commit is contained in:
Jens Petersen 2013-07-26 12:18:47 +09:00
parent e5c7bca0e8
commit 40a7e828d4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-rpm-macros.ghc
View File

@ -86,7 +86,7 @@ install --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.d\
# ghc_lib_build_without_haddock [name] [version]
%ghc_lib_build_without_haddock()\
%global debug_package %{nil}\
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1 --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\
%cabal build\
%{nil}

9
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.0.5
Version: 1.0.6
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@ -24,7 +24,8 @@ Source3: ghc-deps.sh
Source4: cabal-tweak-dep-ver
Source5: cabal-tweak-flag
Source6: ghc-rpm-macros.ghc-extra
Requires: redhat-rpm-config
# ver-rel for unversioned docdir
Requires: redhat-rpm-config >= 9.1.0-50.fc20
%if %{undefined without_hscolour}
BuildRequires: redhat-rpm-config
ExclusiveArch: %{ghc_arches}
@ -89,6 +90,10 @@ EOF
%changelog
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 1.0.6-1
- also make %ghc_lib_build docdir unversioned
- require redhat-rpm-config >= 9.1.0-50.fc20 for unversioned docdir
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 1.0.5-1
- F20 Change: docdir's are now unversioned