blob: b995f9bce56e63dd12e72e35bea8265a78ce7044 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.ghc
--- origin/ghc-rpm-macros-2.5.2/macros.ghc 2023-03-19 08:16:20.000000000 +0800
+++ ghc-rpm-macros-2.5.2/macros.ghc 2023-09-26 16:30:17.418978816 +0800
@@ -161,8 +161,8 @@
exit 1\
fi\
%define basepkg %{ghc_prefix}-%{pkgname}\
-rm -f %{basepkg}.files %{basepkg}-doc.files\
-touch %{basepkg}.files %{basepkg}-doc.files\
+rm -f %{basepkg}.files %{basepkg}-help.files\
+touch %{basepkg}.files %{basepkg}-help.files\
%if 0%{?1:1}\
if [ -d "%{buildroot}%{_ghclicensedir}/%{basepkg}" ]; then\
for i in $(ls %{buildroot}%{_ghclicensedir}/%{basepkg}); do\
@@ -194,18 +194,18 @@
%if %{with haddock}\
haddock_dir=%{ghc_html_libraries_dir}/%{pkgnamever}\
if [ -d %{buildroot}$haddock_dir ]; then\
-echo $haddock_dir >> %{basepkg}-doc.files\
+echo $haddock_dir >> %{basepkg}-help.files\
%if %{with hadrian}\
# for < 9.4.1-rc1\
else\
haddock_dir=%{ghc_html_libraries_dir}/%{pkgname}\
if [ -d %{buildroot}$haddock_dir ]; then\
-echo $haddock_dir >> %{basepkg}-doc.files\
+echo $haddock_dir >> %{basepkg}-help.files\
fi\
%endif\
fi\
%endif\
-for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-doc.files %{basepkg}-prof.files; do\
+for i in %{basepkg}.files %{basepkg}-devel.files %{basepkg}-help.files %{basepkg}-prof.files; do\
if [ -f "$i" ]; then\
sed -i -e "s!%{buildroot}!!g" $i\
fi\
@@ -217,7 +217,7 @@
cat %{name}-%1.files >> %{name}-%2.files\
cat %{name}-%1-devel.files >> %{name}-%2-devel.files\
%if %{with haddock}\
-cat %{name}-%1-doc.files >> %{name}-%2-doc.files\
+cat %{name}-%1-help.files >> %{name}-%2-help.files\
%endif\
%if %{with ghc_prof}\
cat %{name}-%1-prof.files >> %{name}-%2-prof.files\
diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc-extra ghc-rpm-macros-2.5.2/macros.ghc-extra
--- origin/ghc-rpm-macros-2.5.2/macros.ghc-extra 2023-02-02 23:29:52.000000000 +0800
+++ ghc-rpm-macros-2.5.2/macros.ghc-extra 2023-09-26 10:29:01.799794938 +0800
@@ -48,16 +48,16 @@
\
%if 0%{!-m:1}\
%if %{with haddock}\
-%package -n %{basepkg}-doc\
+%package -n %{basepkg}-help\
Summary: Haskell %{pkgname} library documentation\
%{?1:Version: %{pkgver}}\
%{-l:License: %{-l*}}\
BuildArch: noarch\
Requires: %{ghc_prefix}-filesystem\
-%{?ghc_obsoletes_name:Obsoletes: %{ghc_obsoletes_name}-%{pkgname}-doc < %{pkgver}-%{release}}\
-Supplements: (%{basepkg}-devel and %{ghc_prefix}-doc)\
+%{?ghc_obsoletes_name:Obsoletes: %{ghc_obsoletes_name}-%{pkgname}-help < %{pkgver}-%{release}}\
+Supplements: (%{basepkg}-devel and %{ghc_prefix}-help)\
\
-%description -n %{basepkg}-doc\
+%description -n %{basepkg}-help\
This package provides the Haskell %{pkgname} library documentation.\
%endif\
\
@@ -81,7 +81,7 @@
%if 0%{!-m:1}\
\
%if %{with haddock}\
-%files -n %{basepkg}-doc -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-doc.files\
+%files -n %{basepkg}-help -f %{!-d:%{pkgname}-%{pkgver}/}%{basepkg}-help.files\
%endif\
\
%if %{with ghc_prof}\
|
