define ghc_prefix (used for ghcX.Y packaging)
This commit is contained in:
parent
7f9cbd873d
commit
051b51f30f
@ -7,8 +7,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 2.3.15
|
Version: 2.3.16
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RPM macros for building Haskell packages for GHC
|
Summary: RPM macros for building Haskell packages for GHC
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
@ -183,6 +183,9 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 16 2022 Jens Petersen <petersen@redhat.com> - 2.3.16-1
|
||||||
|
- define ghc_prefix (used for ghcX.Y packaging)
|
||||||
|
|
||||||
* Wed Apr 27 2022 Jens Petersen <petersen@redhat.com> - 2.3.15-2
|
* Wed Apr 27 2022 Jens Petersen <petersen@redhat.com> - 2.3.15-2
|
||||||
- drop ghc-compiler requires to allow using ghcX.Y-compiler-default
|
- drop ghc-compiler requires to allow using ghcX.Y-compiler-default
|
||||||
|
|
||||||
|
@ -46,8 +46,11 @@ fi\
|
|||||||
# no _pkgdocdir in EPEL <= 7
|
# no _pkgdocdir in EPEL <= 7
|
||||||
%ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
%ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
|
# library package prefix
|
||||||
|
%ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}
|
||||||
|
|
||||||
# root dir for ghc docs (used by ghc.spec)
|
# root dir for ghc docs (used by ghc.spec)
|
||||||
%ghc_html_dir %{_docdir}/%{?ghc_name}%{!?ghc_name:ghc}/html
|
%ghc_html_dir %{_docdir}/%{ghc_prefix}/html
|
||||||
# deprecates
|
# deprecates
|
||||||
%ghcdocbasedir %ghc_html_dir
|
%ghcdocbasedir %ghc_html_dir
|
||||||
|
|
||||||
@ -76,7 +79,7 @@ fi\
|
|||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define pkgver %{?2}%{!?2:%{version}}\
|
%define pkgver %{?2}%{!?2:%{version}}\
|
||||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||||
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
|
%define basepkg %{ghc_prefix}-%{pkgname}\
|
||||||
if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ]; then\
|
if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ]; then\
|
||||||
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
|
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
|
||||||
exit 1\
|
exit 1\
|
||||||
|
@ -14,7 +14,6 @@ print(string.sub(pv, string.find(pv, "[%d.]+$")))\
|
|||||||
}}\
|
}}\
|
||||||
%global ghc_subpackages_list %{?ghc_subpackages_list} %{pkgname}-%{pkgver}\
|
%global ghc_subpackages_list %{?ghc_subpackages_list} %{pkgname}-%{pkgver}\
|
||||||
%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\
|
%{!-x:%{?1:%global ghc_packages_list %{?ghc_packages_list} %{pkgname}-%{pkgver}}}\
|
||||||
%define ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}\
|
|
||||||
%define basepkg %{ghc_prefix}-%{pkgname}\
|
%define basepkg %{ghc_prefix}-%{pkgname}\
|
||||||
%if 0%{!-m:1}\
|
%if 0%{!-m:1}\
|
||||||
%package -n %{basepkg}\
|
%package -n %{basepkg}\
|
||||||
@ -52,8 +51,8 @@ Summary: Haskell %{pkgname} library documentation\
|
|||||||
%{?1:Version: %{pkgver}}\
|
%{?1:Version: %{pkgver}}\
|
||||||
%{-l:License: %{-l*}}\
|
%{-l:License: %{-l*}}\
|
||||||
BuildArch: noarch\
|
BuildArch: noarch\
|
||||||
Requires: ghc-filesystem\
|
Requires: %{ghc_prefix}-filesystem\
|
||||||
Supplements: (%{basepkg}-devel and ghc-doc)\
|
Supplements: (%{basepkg}-devel and %{ghc_prefix}-doc)\
|
||||||
\
|
\
|
||||||
%description -n %{basepkg}-doc\
|
%description -n %{basepkg}-doc\
|
||||||
This package provides the Haskell %{pkgname} library documentation.\
|
This package provides the Haskell %{pkgname} library documentation.\
|
||||||
@ -65,7 +64,7 @@ Summary: Haskell %{pkgname} profiling library\
|
|||||||
%{?1:Version: %{pkgver}}\
|
%{?1:Version: %{pkgver}}\
|
||||||
%{-l:License: %{-l*}}\
|
%{-l:License: %{-l*}}\
|
||||||
Requires: %{ghc_prefix}-%{pkgname}-devel%{?_isa} = %{pkgver}-%{release}\
|
Requires: %{ghc_prefix}-%{pkgname}-devel%{?_isa} = %{pkgver}-%{release}\
|
||||||
Supplements: (%{basepkg}-devel and ghc-prof)\
|
Supplements: (%{basepkg}-devel and %{ghc_prefix}-prof)\
|
||||||
\
|
\
|
||||||
%description -n %{basepkg}-prof\
|
%description -n %{basepkg}-prof\
|
||||||
This package provides the Haskell %{pkgname} profiling library.\
|
This package provides the Haskell %{pkgname} profiling library.\
|
||||||
|
Loading…
Reference in New Issue
Block a user