public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ImageMagick] f43: Fix documentation packaging and plugin build-ID ownership
@ 2026-11-07 19:29 Luya Tshimbalanga
  0 siblings, 0 replies; only message in thread
From: Luya Tshimbalanga @ 2026-11-07 19:29 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/ImageMagick
Branch : f43
Commit : 147104f64d242f88f78fbf10bc9ff8e08ba45db9
Author : Luya Tshimbalanga <luya@fedoraproject.org>
Date   : 2026-11-07T12:07:36-07:00
Stats  : +45/-15 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ImageMagick/c/147104f64d242f88f78fbf10bc9ff8e08ba45db9?branch=f43

Log:
Fix documentation packaging and plugin build-ID ownership

---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 56a68ea..3139977 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -14,7 +14,7 @@
 Name:           ImageMagick
 Epoch:          1
 Version:        7.1.2.35
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An X application for displaying and manipulating images
 
 %global VER %(foo=%{version}; echo ${foo:0:5})
@@ -82,6 +82,7 @@ BuildRequires:  make
 BuildRequires:  gnupg2
 # for doc
 BuildRequires:  doxygen
+BuildRequires:  /usr/bin/hardlink
 
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 # allow smooth upgrade for 3rd party repository
@@ -96,7 +97,7 @@ and Photo CD image formats. It can resize, rotate, sharpen, color
 reduce, or add special effects to an image, and when finished you can
 either save the completed work in the original format or a different
 one. ImageMagick also includes command line programs for creating
-animated or transparent .gifs, creating composite images, creating
+animated or transparent GIF images, creating composite images, creating
 thumbnail images, and more.
 
 ImageMagick is one of your choices if you need a program to manipulate
@@ -143,8 +144,8 @@ Obsoletes: %{name}7-djvu       < %{epoch}:%{version}-%{release}
 Provides:  %{name}7-djvu       = %{epoch}:%{version}-%{release}
 
 %description djvu
-This packages contains a plugin for ImageMagick which makes it possible to
-save and load DjvU files from ImageMagick and libMagickCore using applications.
+This package provides a plugin for reading and writing DjVu images with
+ImageMagick and applications using its core library.
 
 
 %if %{with libheif}
@@ -154,19 +155,20 @@ BuildRequires:  pkgconfig(libheif) >= 1.4.0
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description heic
-This packages contains a plugin for ImageMagick which makes it possible to
-save and load HEIC files from ImageMagick and libMagickCore using applications.
+This package provides a plugin for reading and writing HEIC images with
+ImageMagick and applications using its core library.
 %endif
 
 
 %package doc
-Summary: ImageMagick html documentation
+Summary: ImageMagick HTML documentation
+BuildArch: noarch
 Obsoletes: %{name}7-doc < %{epoch}:%{version}-%{release}
 Provides:  %{name}7-doc = %{epoch}:%{version}-%{release}
 
 %description doc
 ImageMagick documentation, this package contains usage (for the
-commandline tools) and API (for the libraries) documentation in html format.
+command line tools) and API (for the libraries) documentation in HTML format.
 Note this documentation can also be found on the ImageMagick website:
 http://www.imagemagick.org/
 
@@ -223,6 +225,10 @@ however.
 %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}
 %autosetup -p1 -n %{name}-%{VER}-%{Patchlevel}
 
+# Preserve example sources and input images before the demos are built.
+mkdir -p Magick++/examples
+cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples/
+
 
 %build
 autoconf -f -i -v
@@ -276,6 +282,25 @@ make html-local
 %install
 %make_install
 
+# List core modules without processing plugins owned by other subpackages.
+# Recursive inclusion followed by exclusion also collects their build-ID links.
+find %{buildroot}%{_libdir}/%{name}-%{VER} -type d -print \
+    | sed 's|%{buildroot}||; s|^|%%dir |' > libs-modules.list
+find %{buildroot}%{_libdir}/%{name}-%{VER} ! -type d \
+    ! -path '*/coders/djvu.*' \
+%if %{with libheif}
+    ! -path '*/coders/heic.*' \
+%endif
+    -print | sed 's|%{buildroot}||' >> libs-modules.list
+
+# Install clean examples instead of the demo build directory.
+mkdir -p %{buildroot}%{_docdir}/%{name}-c++-devel
+cp -pr Magick++/examples %{buildroot}%{_docdir}/%{name}-c++-devel/
+
+# Deduplicate within each subpackage; do not link files across packages.
+hardlink -tv --reflink=never %{buildroot}%{_docdir}/%{name}-7
+hardlink -tv --reflink=never %{buildroot}%{_docdir}/%{name}-c++-devel
+
 # Compatibility symlinks for headers for IM6->IM7 transition
 ln -sr %{buildroot}%{_includedir}/%{name}-7/MagickCore %{buildroot}%{_includedir}/%{name}-7/magick
 ln -sr %{buildroot}%{_includedir}/%{name}-7/MagickWand %{buildroot}%{_includedir}/%{name}-7/wand
@@ -357,17 +382,12 @@ rm PerlMagick/demo/Generic.ttf
 %{_mandir}/man[145]/[a-z]*
 %{_mandir}/man1/%{name}.*
 
-%files libs
+%files libs -f libs-modules.list
 %doc NOTICE AUTHORS.txt
 %license LICENSE
 %{_libdir}/libMagickCore-7.Q16HDRI.so.%{libsover}{,.*}
 %{_libdir}/libMagickWand-7.Q16HDRI.so.%{libsover}{,.*}
-%{_libdir}/%{name}-%{VER}
 %{_datadir}/%{name}-7
-%exclude %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/djvu.*
-%if %{with libheif}
-%exclude %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/heic.*
-%endif
 %dir %{_sysconfdir}/%{name}-7
 %config(noreplace) %{_sysconfdir}/%{name}-7/*.xml
 
@@ -391,10 +411,14 @@ rm PerlMagick/demo/Generic.ttf
 %{_mandir}/man1/MagickWand-config.*
 
 %files djvu
+%doc NOTICE AUTHORS.txt
+%license LICENSE
 %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/djvu.*
 
 %if %{with libheif}
 %files heic
+%doc NOTICE AUTHORS.txt
+%license LICENSE
 %{_libdir}/%{name}-%{VER}/modules-Q16HDRI/coders/heic.*
 %endif
 
@@ -407,7 +431,7 @@ rm PerlMagick/demo/Generic.ttf
 %{_libdir}/libMagick++-7.Q16HDRI.so.%{libcxxsover}{,.*}
 
 %files c++-devel
-%doc Magick++/demo
+%doc %{_docdir}/%{name}-c++-devel
 %{_bindir}/Magick++-config
 %{_includedir}/%{name}-7/Magick++/
 %{_includedir}/%{name}-7/Magick++.h
@@ -423,6 +447,12 @@ rm PerlMagick/demo/Generic.ttf
 %endif
 
 %changelog
+* Sun Nov 01 2026 Luya Tshimbalanga <luya@fedoraproject.org> - 1:7.1.2.35-2
+- Correct package descriptions and include plugin documentation and licenses
+- List core modules separately to avoid duplicate plugin build-ID links
+- Package clean Magick++ example sources without demo build artifacts
+- Make the documentation subpackage noarch and hardlink duplicate documentation
+
 * Sun Nov 01 2026 Packit <hello@packit.dev> - 1:7.1.2.35-1
 - Update to version 7.1.2.35
 - Resolves: rhbz#2564509

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-07 19:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-07 19:29 [rpms/ImageMagick] f43: Fix documentation packaging and plugin build-ID ownership Luya Tshimbalanga

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox