From c850bd2bb1d9692cb0b6d0e054f53a028db7e3b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 11:44:36 +0200 Subject: update to 8.10.0-rc1 --- vips.spec | 53 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) (limited to 'vips.spec') diff --git a/vips.spec b/vips.spec index 46030b9..e229af2 100644 --- a/vips.spec +++ b/vips.spec @@ -7,28 +7,32 @@ # # Please preserve changelog entries # -%global vips_version_base 8.9 -%global vips_version %{vips_version_base}.2 +%global vips_version_base 8.10 +%global vips_version %{vips_version_base}.0 %global vips_soname_major 42 -#global vips_prever rc4 +%global vips_prever rc1 %global vips_tarver %{vips_version}%{?vips_prever:-%{vips_prever}} %if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_doc 1 +%bcond_without doc %else -%global with_doc 0 +%bcond_with doc %endif %if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_libimagequant 1 +%bcond_without libimagequant %else -%global with_libimagequant 0 +%bcond_with libimagequant %endif # from mock config, when rpmfusion enabled -%global with_libheif 0%{?_with_rpmfusion:1} +%if 0%{?_with_rpmfusion:1} +%bcond_without libheif +%else +%bcond_with libheif +%endif -%if %{with_libheif} +%if %{with libheif} Name: vips-full # Keep vips-full release > vips release Release: 2%{?dist} @@ -66,15 +70,15 @@ BuildRequires: pkgconfig(libtiff-4) # upstream requires 0.6 BuildRequires: pkgconfig(libwebp) > 1 BuildRequires: pkgconfig(libexif) -BuildRequires: pkgconfig(openslide) +BuildRequires: pkgconfig(openslide) >= 3.3.0 BuildRequires: pkgconfig(libgsf-1) BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.3 BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(libjpeg) -%if %{with_libheif} +%if %{with libheif} BuildRequires: pkgconfig(libheif) %endif -%if %{with_libimagequant} +%if %{with libimagequant} #BuildRequires: pkgconfig(imagequant) TODO only in 2.12+ BuildRequires: libimagequant-devel %endif @@ -84,7 +88,7 @@ BuildRequires: pkgconfig(gthread-2.0) BuildRequires: gcc-c++ BuildRequires: pkgconfig gettext -%if %{with_libheif} +%if %{with libheif} Conflicts: vips < %{version}-%{release} Provides: vips = %{version}-%{release} Provides: vips%{?_isa} = %{version}-%{release} @@ -104,7 +108,7 @@ against VIPS. Summary: Development files for %{name} Requires: libjpeg-devel%{?_isa} libtiff-devel%{?_isa} zlib-devel%{?_isa} Requires: %{name}%{?_isa} = %{version}-%{release} -%if %{with_libheif} +%if %{with libheif} Conflicts: vips-devel < %{version}-%{release} %endif # for consistency, same version at buildtime and runtime @@ -124,7 +128,7 @@ contains a C++ API and development documentation. %package tools Summary: Command-line tools for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%if %{with_libheif} +%if %{with libheif} Conflicts: vips-tools < %{version}-%{release} %endif @@ -132,12 +136,12 @@ Conflicts: vips-tools < %{version}-%{release} The %{name}-tools package contains command-line tools for working with VIPS. -%if %{with_doc} +%if %{with doc} %package doc Summary: Documentation for %{name} BuildRequires: swig gtk-doc Conflicts: %{name} < %{version}-%{release}, %{name} > %{version}-%{release} -%if %{with_libheif} +%if %{with libheif} Conflicts: vips-doc < %{version}-%{release} %endif @@ -167,12 +171,18 @@ sed -i 's|sys_lib_dlsearch_path_spec="|sys_lib_dlsearch_path_spec="/%{_lib} %{_l export CFLAGS="%{optflags} -ftree-vectorize" export CXXFLAGS="%{optflags} -ftree-vectorize" %configure \ -%if %{with_libheif} +%if %{with libheif} --with-heif \ %else --without-heif \ %endif -%if %{with_doc} +%if %{with libimagequant} + --with-imagequant \ +%else + --without-imagequant \ +%endif + --without-libspng \ +%if %{with doc} --enable-gtk-doc \ %endif --disable-static @@ -220,7 +230,7 @@ sed -e 's:/usr/bin/python:%{_bindir}/python3:' -i %{buildroot}/%{_bindir}/vipspr %{_mandir}/man1/* -%if %{with_doc} +%if %{with doc} %files doc %doc doc/html %license COPYING @@ -228,6 +238,9 @@ sed -e 's:/usr/bin/python:%{_bindir}/python3:' -i %{buildroot}/%{_bindir}/vipspr %changelog +* Thu Jul 16 2020 Remi Collet - 8.10.0~rc1-1 +- update to 8.10.0-rc1 + * Tue Apr 21 2020 Remi Collet - 8.9.2-1 - update to 8.9.2 -- cgit