summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick7.spec98
1 files changed, 64 insertions, 34 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index acb5f97..800ab4e 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -26,6 +26,12 @@
%global with_raqm 1
%global with_gvc 1
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9
+%global with_jxl 1
+%else
+%global with_jxl 0
+%endif
+
%if 0%{?fedora} || 0%{?rhel} >= 8
%global with_lqr 1
%else
@@ -37,14 +43,15 @@
%global libname ImageMagick
-# No need to relocate for now, as ImageMagick-7 is not ImageMagick-6
+# No need to relocate ImageMagick is v6, or same soname
%global move 0
-%if 0%{?fedora} >= 99 || 0%{?rhel} >= 99
+%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10
Name: %{libname}
%else
Name: %{libname}7
%endif
+Epoch: 1
Version: %{VER}.%{Patchlevel}
Release: 1%{?dist}
Summary: An X application for displaying and manipulating images
@@ -53,8 +60,12 @@ Url: http://www.imagemagick.org/
#Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
#Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
#Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
-Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
+Source0: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz
+Source1: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc
+Source2: ImageMagick.keyring
+BuildRequires: gnupg2
+BuildRequires: autoconf automake make
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -117,27 +128,32 @@ BuildRequires: pkgconfig(raqm)
BuildRequires: libraqm-devel
%endif
%endif
+%if %{with_jxl}
+BuildRequires: pkgconfig(libjxl) >= 0.7
+%endif
%if %{with_lqr}
BuildRequires: liblqr-1-devel
%endif
# Ensure latest version is used
BuildRequires: pkgconfig(libzip) >= 1.7
+BuildRequires: pkgconfig(pango) >= 1.28.1
+BuildRequires: pkgconfig(pangocairo) >= 1.28.1
# For tests
-BuildRequires: urw-base35-fonts
+BuildRequires: urw-base35-fonts-devel
BuildRequires: open-sans-fonts
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" != "%{libname}"
# This could be improved in the future
# https://bugzilla.redhat.com/849065
-Conflicts: %{libname} < %{version}
-Conflicts: %{libname}-last < %{version}
-Conflicts: %{libname}6 < %{version}
-Provides: %{libname} = %{version}-%{release}
-Provides: %{libname}%{?_isa} = %{version}-%{release}
+Conflicts: %{libname} < %{epoch}:%{version}
+Conflicts: %{libname}-last < %{epoch}:%{version}
+Conflicts: %{libname}6 < %{epoch}:%{version}
+Provides: %{libname} = %{epoch}:%{version}-%{release}
+Provides: %{libname}%{?_isa} = %{epoch}:%{version}-%{release}
%else
-Obsoletes: %{libname}7 <= %{version}-%{release}
+Obsoletes: %{libname}7 <= %{epoch}:%{version}-%{release}
%endif
# Filter private shared
@@ -164,7 +180,7 @@ be installed together.
%package devel
Summary: Library links and header files for ImageMagick app development
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libX11-devel, libXext-devel, libXt-devel
Requires: ghostscript-devel%{?_isa}
Requires: bzip2-devel%{?_isa}
@@ -243,9 +259,9 @@ BuildRequires: pkgconfig(ddjvuapi)
%else
BuildRequires: djvulibre-devel
%endif
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}7-djvu <= %{version}-%{release}
+Obsoletes: %{libname}7-djvu <= %{epoch}:%{version}-%{release}
%endif
%description djvu
@@ -266,9 +282,9 @@ BuildRequires: pkgconfig(libheif) >= 1.4.0
# ensure we use our on EL-7
Requires: libheif%{?_isa} >= 1.4.0
%endif
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}7-heic <= %{version}-%{release}
+Obsoletes: %{libname}7-heic <= %{epoch}:%{version}-%{release}
%endif
%description heic
@@ -285,7 +301,7 @@ for applications requiring this libraries.
Summary: ImageMagick html documentation
BuildRequires: doxygen
%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}7-doc <= %{version}-%{release}
+Obsoletes: %{libname}7-doc <= %{epoch}:%{version}-%{release}
%endif
%description doc
@@ -300,16 +316,16 @@ http://www.imagemagick.org/
%package perl
Summary: ImageMagick perl bindings
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%if "%{name}" != "%{libname}"
-Conflicts: %{libname}-perl < %{version}
-Conflicts: %{libname}-last-perl < %{version}
-Conflicts: %{libname}6-perl < %{version}
-Provides: %{libname}-perl = %{version}-%{release}
-Provides: %{libname}-perl%{?_isa} = %{version}-%{release}
+Conflicts: %{libname}-perl < %{epoch}:%{version}
+Conflicts: %{libname}-last-perl < %{epoch}:%{version}
+Conflicts: %{libname}6-perl < %{epoch}:%{version}
+Provides: %{libname}-perl = %{epoch}:%{version}-%{release}
+Provides: %{libname}-perl%{?_isa} = %{epoch}:%{version}-%{release}
%else
-Obsoletes: %{libname}7-perl <= %{version}-%{release}
+Obsoletes: %{libname}7-perl <= %{epoch}:%{version}-%{release}
%endif
%description perl
@@ -321,9 +337,9 @@ ImageMagick.
%package c++
Summary: ImageMagick Magick++ library (C++ bindings)
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" == "%{libname}"
-Obsoletes: %{libname}7-c++ <= %{version}-%{release}
+Obsoletes: %{libname}7-c++ <= %{epoch}:%{version}-%{release}
%endif
%description c++
@@ -339,16 +355,16 @@ for applications requiring this libraries.
%package c++-devel
Summary: C++ bindings for the ImageMagick library
-Requires: %{name}-c++%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" != "%{libname}"
-Conflicts: %{libname}-c++-devel < %{version}
-Conflicts: %{libname}-last-c++-devel < %{version}
-Conflicts: %{libname}6-c++-devel < %{version}
-Provides: %{libname}-c++-devel = %{version}-%{release}
-Provides: %{libname}-c++-devel%{?_isa} = %{version}-%{release}
+Conflicts: %{libname}-c++-devel < %{epoch}:%{version}
+Conflicts: %{libname}-last-c++-devel < %{epoch}:%{version}
+Conflicts: %{libname}6-c++-devel < %{epoch}:%{version}
+Provides: %{libname}-c++-devel = %{epoch}:%{version}-%{release}
+Provides: %{libname}-c++-devel%{?_isa} = %{epoch}:%{version}-%{release}
%else
-Obsoletes: %{libname}7-c++-devel <= %{version}-%{release}
+Obsoletes: %{libname}7-c++-devel <= %{epoch}:%{version}-%{release}
%endif
%description c++-devel
@@ -365,6 +381,7 @@ however.
%prep
+%{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
# for %%doc
@@ -393,6 +410,8 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
%else
--without-gslib \
%endif
+ --with-pango \
+ --with-fftw \
--with-wmf \
--with-lcms \
--with-openexr \
@@ -413,6 +432,11 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
%else
--without-jbig \
%endif
+%if %{with_jxl}
+ --with-jxl \
+%else
+ --without-jxl \
+%endif
%if %{with_jp2}
--with-openjp2 \
%else
@@ -432,6 +456,7 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
--without-heic \
%endif
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
+ --with-urw-base35-font-dir="%{urw_base35_fontpath}" \
--without-dps \
%if %{move}
--datadir=%{_datadir}/%{name} \
@@ -615,6 +640,11 @@ fi
%changelog
+* Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 7.1.0.57-1
+- bump epoch
+- check archive signature
+- add pango, fftw, jxl and urw-base35-font-dir build options
+
* Mon Jan 2 2023 Remi Collet <remi@remirepo.net> - 7.1.0.57-1
- update to version 7.1.0 patch level 57