From f942657abfb22fc309e8440e9b2ec848c4478204 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 19 Aug 2024 12:37:18 +0800 Subject: [PATCH 1/2] Added 'Buildarch: noarch' to the help subpackage --- ltrace.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ltrace.spec b/ltrace.spec index a201609..14824f4 100644 --- a/ltrace.spec +++ b/ltrace.spec @@ -1,6 +1,6 @@ name: ltrace Version: 0.7.91 -Release: 34 +Release: 35 Summary: Trace the Library and System Calls a Program Makes License: GPLv2+ @@ -51,11 +51,9 @@ ltrace on binaries for which you do not have access to the source. This is still a work in progress, so, for example, the tracking to child processes may fail or some things may not work as expected. -%package help -Summary: Help document for the ltrace package -%description help -Help document for the ltrace package. +%package_help + %prep %autosetup -n %{name}-%{version} -p1 @@ -85,10 +83,17 @@ autoreconf -i %{_mandir}/man5/ltrace.conf.5* %changelog +<<<<<<< HEAD * Fri Jun 28 2024 yingjun.ni - 0.7.91-34 - Add support for ppc64le proc and ELF ABIv2 * Thu Feb 1 2024 peng.zou - 0.7.91-33 +======= +* Mon Aug 19 2024 Wei Zhang - 0.7.91-35 +- Replaced declaration of help subpackage with the 'package_help' macro + +* Tue Dec 19 2023 peng.zou - 0.7.91-34 +>>>>>>> 96f5164 (Added 'Buildarch: noarch' to the help subpackage) - Add support for ppc64le * Tue Aug 29 2023 herengui - 0.7.91-32 -- Gitee From ca5b08ecdef4b9e5aaa00f3bb32945863c2058b6 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 19 Aug 2024 14:28:09 +0800 Subject: [PATCH 2/2] Added 'Buildarch: noarch' to the help subpackage --- ltrace.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ltrace.spec b/ltrace.spec index 14824f4..7cf01f0 100644 --- a/ltrace.spec +++ b/ltrace.spec @@ -83,17 +83,16 @@ autoreconf -i %{_mandir}/man5/ltrace.conf.5* %changelog -<<<<<<< HEAD +* Mon Aug 19 2024 Wei Zhang - 0.7.91-35 +- Replaced declaration of help subpackage with the 'package_help' macro + * Fri Jun 28 2024 yingjun.ni - 0.7.91-34 - Add support for ppc64le proc and ELF ABIv2 * Thu Feb 1 2024 peng.zou - 0.7.91-33 -======= -* Mon Aug 19 2024 Wei Zhang - 0.7.91-35 - Replaced declaration of help subpackage with the 'package_help' macro * Tue Dec 19 2023 peng.zou - 0.7.91-34 ->>>>>>> 96f5164 (Added 'Buildarch: noarch' to the help subpackage) - Add support for ppc64le * Tue Aug 29 2023 herengui - 0.7.91-32 -- Gitee