diff --git a/disable-debuginfo.patch b/disable-debuginfo.patch deleted file mode 100644 index 5619a97cdc9b40b8462a3f8ac6c0b1f5516dcc40..0000000000000000000000000000000000000000 --- a/disable-debuginfo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --color -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 2024-11-25 15:20:50.898572173 +0800 -+++ ghc-rpm-macros-2.5.2/macros.ghc 2024-11-25 15:21:37.198575587 +0800 -@@ -12,14 +12,14 @@ - # ghc_bin_build: -W: use default ghc (ie ignore ghc_name) - %ghc_bin_build(W)\ - %ghc_fix_doc_perms\ --%{?!ghc_debuginfo:%undefine _enable_debug_packages}\ -+%{?!ghc_debuginfo:%global debug_package %{nil}}\ - %cabal_configure\ - %cabal build %{?ghc_smp_mflags} %{?cabal_build_options} - - # ghc_lib_build_without_haddock [name] [version] - %ghc_lib_build_without_haddock()\ - %ghc_fix_doc_perms\ --%{?!ghc_debuginfo:%undefine _enable_debug_packages}\ -+%{?!ghc_debuginfo:%global debug_package %{nil}}\ - %if 0%{?rhel} && 0%{?rhel} < 8\ - licensedirversion=%{?2:-%2}\ - %endif\ diff --git a/ghc-rpm-macros-2.5.2.tar.xz b/ghc-rpm-macros-2.5.2.tar.xz deleted file mode 100644 index 4b2a7603a2dd451c3afe907f9c34a6a5d36c9438..0000000000000000000000000000000000000000 Binary files a/ghc-rpm-macros-2.5.2.tar.xz and /dev/null differ diff --git a/ghc-rpm-macros-2.7.2.tar.xz b/ghc-rpm-macros-2.7.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f644240e332f9ab484ddfe0a75dac627f5be02c9 Binary files /dev/null and b/ghc-rpm-macros-2.7.2.tar.xz differ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index ad52e8e2034c41f408ee022bafea91315c064e24..2d8918e66a079806d98a18353b9e93d8fcd3c623 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 2.5.2 +Version: 2.7.2 Release: 3 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later @@ -8,7 +8,6 @@ Source0: %{name}-%{version}.tar.xz # In openEuler, we use help as documents package's suffix instead of doc. Patch1: using-help-as-doc-packages-suffix.patch # Use debug_package instead of _enable_debug_packages to disable debuginfo. -Patch2: disable-debuginfo.patch BuildRequires: xz Requires: rpm Requires: chrpath @@ -63,6 +62,11 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs %{_rpmmacrodir}/macros.ghc-extra %changelog +* Thu Dec 05 2024 jinshuaiyu 2.7.2-1 +- Update to 2.7.2 +- Improve ghc_delete_rpaths to delete trailing :_libdir +- Remove disable-debuginfo.patch because it has been modified in the source code + * Mon Nov 25 2024 Lin Runze 2.5.2-3 - Use debug_package instead of _enable_debug_packages to disable debuginfo