From a61084c6539e923c5d2adcd84315616d2dfa78c4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 5 Jul 2021 10:41:03 +0200
Subject: minor cleanup from Fedora

---
 vips.spec | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'vips.spec')

diff --git a/vips.spec b/vips.spec
index 61022c3..79ce836 100644
--- a/vips.spec
+++ b/vips.spec
@@ -164,10 +164,11 @@ The %{name}-tools package contains command-line tools for working with VIPS.
 
 %if %{with doc}
 %package doc
-Summary:    Documentation for %{name}
-BuildRequires: swig gtk-doc
-Conflicts:  %{name} < %{version}-%{release}, %{name} > %{version}-%{release}
-Obsoletes:  vips-full-doc < 8.11
+Summary:       Documentation for %{name}
+BuildRequires: gtk-doc
+BuildRequires: doxygen
+Conflicts:     %{name} < %{version}-%{release}, %{name} > %{version}-%{release}
+Obsoletes:     vips-full-doc < 8.11
 
 %description doc
 The %{name}-doc package contains extensive documentation about VIPS in both
@@ -176,34 +177,34 @@ HTML and PDF formats.
 
 %if %{with heif}
 %package heif
-Summary:       heif support for %{name}
+Summary:       Heif support for %{name}
 BuildRequires: pkgconfig(libheif) >= 1.3
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:     vips-full < 8.11
 
 %description heif
-The %{name}-heif package contains the heif module.
+The %{name}-heif package contains the Heif module for VIPS.
 %endif
 
 %package openslide
-Summary:       openslide support for %{name}
+Summary:       OpenSlide support for %{name}
 BuildRequires: pkgconfig(openslide) >= 3.3.0
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description openslide
-The %{name}-openslide package contains the openslide module.
+The %{name}-openslide package contains the OpenSlide module for VIPS.
 
 %package poppler
-Summary:       poppler support for %{name}
+Summary:       Poppler support for %{name}
 BuildRequires: pkgconfig(poppler-glib)
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description poppler
-The %{name}-poppler package contains the poppler module.
+The %{name}-poppler package contains the Poppler module for VIPS.
 
 %if %{with im6}
 %package magick-im6
-Summary:       magick support for %{name} using ImageMagick6
+Summary:       Magick support for %{name} using ImageMagick6
 %if 0%{?fedora} >= 99 || 0%{?rhel} >= 99
 BuildRequires: ImageMagick-devel
 %else
@@ -216,12 +217,13 @@ Conflicts:     %{name}-magick-im7
 Conflicts:     %{name}-magick-gm
 
 %description magick-im6
-The %{name}-magick-im6 package contains the magick module using ImageMagick6.
+The %{name}-magick-im6 package contains the Magick module for VIPS
+using ImageMagick version 6.
 %endif
 
 %if %{with im7}
 %package magick-im7
-Summary:       magick support for %{name} using ImageMagick7
+Summary:       Magick support for %{name} using ImageMagick7
 BuildRequires: ImageMagick7-devel
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Provides:      %{name}-magick = %{version}-%{release}
@@ -229,12 +231,13 @@ Conflicts:     %{name}-magick-im6
 Conflicts:     %{name}-magick-gm
 
 %description magick-im7
-The %{name}-magick-im7 package contains the magick module using ImageMagick7.
+The %{name}-magick-im7 package contains the Magick module for VIPS
+using ImageMagick version 7.
 %endif
 
 %if %{with gm}
 %package magick-gm
-Summary:       magick support for %{name} using ImageMagick7
+Summary:       Magick support for %{name} using GraphicsMagick
 BuildRequires: GraphicsMagick-devel
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Provides:      %{name}-magick = %{version}-%{release}
@@ -242,7 +245,8 @@ Conflicts:     %{name}-magick-im6
 Conflicts:     %{name}-magick-im7
 
 %description magick-gm
-The %{name}-magick-gm contains the magick module using GraphicsMagick.
+The %{name}-magick-gm contains the Magick module  for VIPS
+using GraphicsMagick.
 %endif
 
 
@@ -307,6 +311,10 @@ rm -rf %{buildroot}%{_datadir}/doc/vips
 sed -e 's:/usr/bin/python:%{_bindir}/python3:' -i %{buildroot}/%{_bindir}/vipsprofile
 %endif
 
+%if %{with doc}
+mv cplusplus/html cplusplus_html
+%endif
+
 # locale stuff
 %find_lang vips%{vips_version_base}
 
@@ -341,6 +349,7 @@ sed -e 's:/usr/bin/python:%{_bindir}/python3:' -i %{buildroot}/%{_bindir}/vipspr
 %if %{with doc}
 %files doc
 %doc doc/html
+%doc cplusplus_html
 %license COPYING
 %endif
 
-- 
cgit