From 38a1cbfc5073d671d1a6e64870d389498fc3462f 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 16:08:31 +0800 Subject: [PATCH 1/2] Replaced declaration of help subpackage with the 'package_help' macro. --- ImageMagick.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index af6e65e..084b438 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -4,7 +4,7 @@ Name: ImageMagick Epoch: 1 Version: 7.1.1.35 -Release: 1 +Release: 2 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT Url: https://www.imagemagick.org/ @@ -43,13 +43,7 @@ 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} - -%description help -HTML documentation for ImageMagick. +%package_help %package perl Summary: Perl bindings to ImageMagick @@ -174,6 +168,9 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog +* Mon Aug 19 2024 Jingbo Hou - 1:7.1.1.35-2 +- Replaced declaration of help subpackage with the 'package_help' macro. + * Thu Jul 25 2024 Funda Wang - 1:7.1.1.35-1 - Update to 7.1.1-35 -- Gitee From 87c48054f30a2694cec22922b560cb74f34bf6df 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:07:37 +0800 Subject: [PATCH 2/2] Added 'Buildarch: noarch' to the help subpackage. --- ImageMagick.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 084b438..636d3b5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,7 +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 @@ -168,8 +175,8 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog -* Mon Aug 19 2024 Jingbo Hou - 1:7.1.1.35-2 -- Replaced declaration of help subpackage with the 'package_help' macro. +* Tue Aug 20 2024 Jingbo Hou - 1:7.1.1.35-2 +- Added 'Buildarch: noarch' to the help subpackage. * Thu Jul 25 2024 Funda Wang - 1:7.1.1.35-1 - Update to 7.1.1-35 -- Gitee