25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
|
diff -Nru ghc-rpm-macros-2.5.3~007effd.orig/macros.ghc ghc-rpm-macros-2.5.3~007effd/macros.ghc
|
||
|
|
--- ghc-rpm-macros-2.5.3~007effd.orig/macros.ghc 2023-11-12 11:07:40.000000000 +0100
|
||
|
|
+++ ghc-rpm-macros-2.5.3~007effd/macros.ghc 2023-11-12 11:54:23.010525844 +0100
|
||
|
|
@@ -7,7 +7,7 @@
|
||
|
|
./Setup
|
||
|
|
|
||
|
|
# compiler version
|
||
|
|
-%ghc_version %{?ghc_version_override}%{!?ghc_version_override:%(rpm -q --qf %%{version} %{?ghc_name}%{!?ghc_name:ghc}-compiler)}
|
||
|
|
+%ghc_version %{?ghc_version_override}%{!?ghc_version_override:%(rpm -q --qf %%{version} %{?ghc_name}%{!?ghc_name:ghc})}
|
||
|
|
|
||
|
|
%ghc_major_version %(echo %{ghc_version} | sed -e "s/\\(.*\\)\\.[0-9]\\+/\\1/")
|
||
|
|
|
||
|
|
diff -Nru ghc-rpm-macros-2.5.3~007effd.orig/macros.ghc-extra ghc-rpm-macros-2.5.3~007effd/macros.ghc-extra
|
||
|
|
--- ghc-rpm-macros-2.5.3~007effd.orig/macros.ghc-extra 2023-11-12 11:07:40.000000000 +0100
|
||
|
|
+++ ghc-rpm-macros-2.5.3~007effd/macros.ghc-extra 2023-11-12 11:55:04.558493782 +0100
|
||
|
|
@@ -34,7 +34,7 @@
|
||
|
|
%{-l:License: %{-l*}}\
|
||
|
|
Provides: %{basepkg}-static = %{pkgver}-%{release}\
|
||
|
|
Provides: %{basepkg}-static%{?_isa} = %{pkgver}-%{release}\
|
||
|
|
-Requires: %{ghc_prefix}-compiler = %{ghc_version}%{?ghc_version_override:-%{release}}\
|
||
|
|
+Requires: %{ghc_prefix} = %{ghc_version}%{?ghc_version_override:-%{release}}\
|
||
|
|
%if 0%{!-m:1}\
|
||
|
|
Requires: %{ghc_prefix}-%{pkgname}%{?_isa} = %{pkgver}-%{release}\
|
||
|
|
%endif\
|