use shell variable instead of macro to carry licensedir version
This commit is contained in:
parent
97922d41b7
commit
7faec45fdd
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.6.50
|
Version: 1.6.50
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: RPM macros for building Haskell packages for GHC
|
Summary: RPM macros for building Haskell packages for GHC
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
|
@ -161,6 +161,9 @@ EOF
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 15 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-7
|
||||||
|
- use shell variable instead of macro to carry licensedir version
|
||||||
|
|
||||||
* Tue Nov 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-6
|
* Tue Nov 14 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-6
|
||||||
- make package noarch RHEL > 7
|
- make package noarch RHEL > 7
|
||||||
- only version license dir for RHEL <= 7
|
- only version license dir for RHEL <= 7
|
||||||
|
|
|
@ -129,9 +129,9 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
|
||||||
%ghc_lib_build_without_haddock()\
|
%ghc_lib_build_without_haddock()\
|
||||||
%global debug_package %{nil}\
|
%global debug_package %{nil}\
|
||||||
%if 0%{?rhel} && 0%{?rhel} < 8\
|
%if 0%{?rhel} && 0%{?rhel} < 8\
|
||||||
%define licenseversioned 1\
|
licensedirversion=%{?2:-%2}\
|
||||||
%endif\
|
%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_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${licensedirversion} --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}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue