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

for rhel > 7 noarch and no license dir version

Browse Source
This commit is contained in:
Jens Petersen 2017-11-14 19:22:31 +09:00
parent 3643446b23
commit 97922d41b7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghc-rpm-macros.spec
View File

@ -11,7 +11,7 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.6.50 Version: 1.6.50
Release: 5%{?dist} Release: 6%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -36,7 +36,7 @@ Requires: ghc-compiler
Requires: hscolour Requires: hscolour
%endif %endif
%endif %endif
%if 0%{?fedora} >= 27 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildArch: noarch BuildArch: noarch
%endif %endif
@ -161,6 +161,10 @@ EOF
%changelog %changelog
* Tue Nov 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-6
- make package noarch RHEL > 7
- only version license dir for RHEL <= 7
* Fri Nov 10 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-5 * Fri Nov 10 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-5
- -Werror=format-security fails without -Wall - -Werror=format-security fails without -Wall

5
macros.ghc
View File

@ -128,7 +128,10 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
# ghc_lib_build_without_haddock [name] [version] # ghc_lib_build_without_haddock [name] [version]
%ghc_lib_build_without_haddock()\ %ghc_lib_build_without_haddock()\
%global debug_package %{nil}\ %global debug_package %{nil}\
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %if 0%{?rhel} && 0%{?rhel} < 8\
%define licenseversioned 1\
%endif\
%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1%{?licenseversioned:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
%cabal build %{?ghc_smp_mflags} %{?cabal_build_options}\ %cabal build %{?ghc_smp_mflags} %{?cabal_build_options}\
%{nil} %{nil}