update to 8.15.5-rc1

re-add libvips-cpp

1 files changed, 26 insertions, 23 deletions

diff --git a/vips.spec b/vips.spec
index 84b2b39..ae5d959 100644
--- a/vips.spec
+++ b/vips.spec
@@ -8,16 +8,30 @@
 # Please preserve changelog entries
 #
 %global vips_version_base 8.15
-%global vips_version %{vips_version_base}.4
+%global vips_version %{vips_version_base}.5
 %global vips_soname_major 42
-#global vips_prever rc2
+%global vips_prever rc1
 %global vips_tagver %{vips_version}%{?vips_prever:-%{vips_prever}}
 
+# 3 builds needed to get the full stack
+# --without heif --without im7 --with    im6
+# --without heif --without im7 --with    gm
+# --with    heif --with    im7
+%bcond_with                im6
+%bcond_without             im7
+%bcond_with                gm
+
 %bcond_without             doc
+%bcond_without             cplusplus
+%bcond_without             matio
+%bcond_without             libimagequant
+%bcond_without             libcgif
 
-# C++ library have no stable ABI
-# see https://github.com/libvips/libvips/commit/13ceb78db12ae2fd48796655d85815d5d637fcd6
-%bcond_with                cplusplus
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without             imath
+%else
+%bcond_with                imath
+%endif
 
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without             highway
@@ -25,9 +39,6 @@
 %bcond_with                highway
 %endif
 
-%bcond_without             libimagequant
-%bcond_without             libcgif
-
 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 %bcond_without             openjpeg2
 %else
@@ -46,14 +57,6 @@
 %bcond_with                niftic
 %endif
 
-# 3 builds needed to get the full stack
-# --without heif --without im7 --with    im6
-# --without heif --without im7 --with    gm
-# --with    heif --with    im7
-%bcond_with                im6
-%bcond_without             im7
-%bcond_with                gm
-
 %bcond_without             tests
 
 %if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
@@ -76,7 +79,7 @@ Summary:        C/C++ library for processing large images
 
 License:        LGPLv2+
 URL:            https://libvips.github.io/libvips/
-Source0:        https://github.com/libvips/libvips/releases/download/v%{vips_tagver}/vips-%{vips_version}.tar.xz
+Source0:        https://github.com/libvips/libvips/releases/download/v%{vips_tagver}/vips-%{vips_tagver}.tar.xz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -94,11 +97,10 @@ BuildRequires:  pkgconfig(orc-0.4) >= 0.4.11
 %endif
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(OpenEXR) >= 1.2.2
-%if 0%{?fedora} >= 35
+%if %{with imath}
 BuildRequires:  pkgconfig(Imath)
 %endif
-# https://bugzilla.redhat.com/2034536 - missing in EPEL-9
-%if 0%{?rhel} < 9
+%if %{with matio}
 BuildRequires:  pkgconfig(matio)
 %endif
 BuildRequires:  pkgconfig(cfitsio)
@@ -397,9 +399,6 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 %{_libdir}/*.so.%{vips_soname_major}*
 %{_libdir}/girepository-1.0
 %dir %{_libdir}/vips-modules-%{vips_version_base}
-%if %{with cplusplus}
-%{_libdir}/*cpp.so.%{version}
-%endif
 
 
 %files devel
@@ -457,6 +456,10 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 
 
 %changelog
+* Mon Oct  7 2024 Remi Collet <remi@remirepo.net> - 8.15.5~rc1-1
+- update to 8.15.5-rc1
+- re-add libvips-cpp
+
 * Thu Oct  3 2024 Remi Collet <remi@remirepo.net> - 8.15.4-1
 - update to 8.15.4
 - remove libvips-cpp (C++ library) which have no stable ABI