cleanup + improvde DOC_README

1 files changed, 23 insertions, 11 deletions

diff --git a/vips.spec b/vips.spec
index f529893..110ce69 100644
--- a/vips.spec
+++ b/vips.spec
@@ -31,6 +31,8 @@
 %bcond_without             matio
 %bcond_without             libimagequant
 %bcond_without             libcgif
+%bcond_without             jxl
+%bcond_without             tests
 
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without             imath
@@ -44,7 +46,7 @@
 %bcond_with                highway
 %endif
 
-%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without             openjpeg2
 %else
 # disabled by default
@@ -62,16 +64,8 @@
 %bcond_with                niftic
 %endif
 
-%bcond_without             tests
-
-%if 0%{?fedora} >= 37 || 0%{?rhel} >= 8
-%bcond_without             jxl
-%else
-%bcond_with                jxl
-%endif
-
 # from fedora/epel repository, or from rpmfusion when enabled (from mock config)
-%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || 0%{?_with_rpmfusion:1}
+%if 0%{?fedora} || 0%{?rhel} >= 9 || 0%{?_with_rpmfusion:1}
 %bcond_without             heif
 %else
 %bcond_with                heif
@@ -329,7 +323,24 @@ exit 1
 %setup -q -n vips-%{vips_version}
 
 cat << 'EOF' | tee DOC_README
-Online Documentation
+
+%if %{with gidocgen} || %{with doxygen}
+==== Local Documentation ====
+
+%endif
+%if %{with gidocgen}
+API reference and tools documentation
+
+	/usr/share/doc/vips/index.html
+
+%endif
+%if %{with doxygen}
+C++ documentation
+
+	/usr/share/doc/vips-cpp/html/index.html
+
+%endif
+==== Online Documentation ====
 
 API reference and tools documentation
 
@@ -338,6 +349,7 @@ API reference and tools documentation
 C++ documentation
 
 	https://www.libvips.org/API/%{vips_version_base}/cpp/
+
 EOF