Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/ghc-rpm-macros.git#cc769c3d44fd1afa46ccd77fd8ebc03d6360eab0
This commit is contained in:
DistroBaker 2021-03-11 20:21:18 +00:00
parent 0a4ea6ae08
commit 3440259f22
3 changed files with 16 additions and 2 deletions

View File

@ -10,8 +10,8 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.0.14 Version: 2.0.15
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+
@ -218,6 +218,10 @@ EOF
%changelog %changelog
* Sat Jan 30 2021 Jens Petersen <petersen@redhat.com> - 2.0.15-1
- add ghc_fix_doc_perms and use it in ghc_bin_build and ghc_lib_build
- ghc_lib_subpackage: define ghc_subpackages_list
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-2 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -128,14 +128,23 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
fi\ fi\
%{nil} %{nil}
# workaround Cabal bug causing executable extra-source-files
%ghc_fix_doc_perms\
for f in $(ls | grep -i -e "^\(ANNOUNCE\|AUTHORS\|CHANGELOG\|CHANGES\|CONTRIBUTORS\|README\|TODO\)"); do\
if [ -x $f ]; then chmod a-x $f; fi\
done\
%{nil}
# ghc_bin_build # ghc_bin_build
%ghc_bin_build\ %ghc_bin_build\
%ghc_fix_doc_perms\
%undefine _enable_debug_packages\ %undefine _enable_debug_packages\
%cabal_configure\ %cabal_configure\
%cabal build %{?ghc_smp_mflags} %{?cabal_build_options} %cabal build %{?ghc_smp_mflags} %{?cabal_build_options}
# ghc_lib_build_without_haddock [name] [version] # ghc_lib_build_without_haddock [name] [version]
%ghc_lib_build_without_haddock()\ %ghc_lib_build_without_haddock()\
%ghc_fix_doc_perms\
%undefine _enable_debug_packages\ %undefine _enable_debug_packages\
%if 0%{?rhel} && 0%{?rhel} < 8\ %if 0%{?rhel} && 0%{?rhel} < 8\
licensedirversion=%{?2:-%2}\ licensedirversion=%{?2:-%2}\

View File

@ -12,6 +12,7 @@ print(name)\
local pv = rpm.expand("%1")\ local pv = rpm.expand("%1")\
print(string.sub(pv, string.find(pv, "[%d.]+$")))\ print(string.sub(pv, string.find(pv, "[%d.]+$")))\
}}\ }}\
%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 ghc_prefix %{?ghc_name}%{!?ghc_name:ghc}\
%define basepkg %{ghc_prefix}-%{pkgname}\ %define basepkg %{ghc_prefix}-%{pkgname}\