From 0f1d2b8d4e67f27c386dd84ddcc514b3f97ef22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=AF=E6=99=AF=E5=8D=9A?= Date: Mon, 19 Aug 2024 13:16:26 +0800 Subject: [PATCH 1/2] Replaced declaration of help subpackage with the 'package_help' macro. --- ImageMagick.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 3d76934..0f3488e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ Name: ImageMagick Epoch: 1 Version: 7.1.1.8 -Release: 5 +Release: 6 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT Url: http://www.imagemagick.org/ @@ -43,13 +43,8 @@ Requires: libwebp-devel OpenEXR-devel pkgconfig %description devel Development files for ImageMagick. -%package help -Summary: HTML documentation for ImageMagick -Provides: ImageMagick-doc = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-doc < %{epoch}:%{version}-%{release} +%package_help -%description help -HTML documentation for ImageMagick. %package perl Summary: Perl bindings to ImageMagick @@ -165,6 +160,9 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog +* Mon Aug 19 2024 Jingbo Hou - 1:7.1.1.8-6 +- Replaced declaration of help subpackage with the 'package_help' macro. + * Sat Oct 7 2023 liningjie - 1:7.1.1.8-5 - Fix CVE-2023-5341 -- Gitee From 665b42971cb1ae440425e7f9bd8c16f219553c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=AF=E6=99=AF=E5=8D=9A?= Date: Tue, 20 Aug 2024 14:35:23 +0800 Subject: [PATCH 2/2] Added 'Buildarch: noarch' to the help subpackage. --- ImageMagick.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 0f3488e..b0c3391 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,8 +43,14 @@ Requires: libwebp-devel OpenEXR-devel pkgconfig %description devel Development files for ImageMagick. -%package_help +%package help +Summary: HTML documentation for ImageMagick +Buildarch: noarch +Provides: ImageMagick-doc = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-doc < %{epoch}:%{version}-%{release} +%description help +HTML documentation for ImageMagick. %package perl Summary: Perl bindings to ImageMagick @@ -160,8 +166,8 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog -* Mon Aug 19 2024 Jingbo Hou - 1:7.1.1.8-6 -- Replaced declaration of help subpackage with the 'package_help' macro. +* Tue Aug 20 2024 Jingbo Hou - 1:7.1.1.8-6 +- Added 'Buildarch: noarch' to the help subpackage. * Sat Oct 7 2023 liningjie - 1:7.1.1.8-5 - Fix CVE-2023-5341 -- Gitee