diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-17 07:41:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-17 07:41:52 +0200 |
| commit | 6bb6f0a43f7234ca0009121521f3126872d5cbf4 (patch) | |
| tree | 78021e90668458ef1c7e479c050baf4a99f7aca9 | |
| parent | e152dfd0cfa685da8da2a901470fac209a119749 (diff) | |
| -rw-r--r-- | ImageMagick7.spec | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 5693c2b..0d326a0 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -52,7 +52,7 @@ Name: %{libname}7 %endif Epoch: 1 Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: https://imagemagick.org/ @@ -127,6 +127,7 @@ BuildRequires: urw-base35-fonts-devel BuildRequires: open-sans-fonts Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if "%{name}" != "%{libname}" Conflicts: %{libname} < %{epoch}:%{version} @@ -227,7 +228,8 @@ for applications requiring this libraries. %package djvu Summary: DjVu plugin for ImageMagick BuildRequires: pkgconfig(ddjvuapi) -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if "%{name}" == "%{libname}" Obsoletes: %{libname}7-djvu <= %{epoch}:%{version}-%{release} %endif @@ -250,7 +252,8 @@ BuildRequires: pkgconfig(libheif) >= 1.4.0 # x265 HEVC encoder from RPMFusion Recommends: libheif-freeworld%{?_isa} %endif -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if "%{name}" == "%{libname}" Obsoletes: %{libname}7-heic <= %{epoch}:%{version}-%{release} %endif @@ -284,8 +287,9 @@ http://www.imagemagick.org/ %package perl Summary: ImageMagick perl bindings -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if "%{name}" != "%{libname}" Conflicts: %{libname}-perl < %{epoch}:%{version} Conflicts: %{libname}6-perl < %{epoch}:%{version} @@ -304,7 +308,8 @@ ImageMagick. %package c++ Summary: ImageMagick Magick++ library (C++ bindings) -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if "%{name}" == "%{libname}" Obsoletes: %{libname}7-c++ <= %{epoch}:%{version}-%{release} %endif @@ -508,9 +513,11 @@ ETC=%{_sysconfdir}/%{libname}%{?incsuffixe} %endif if [ -d $ETC -a ! -d $LIB ]; then cat << EOF -WARNING : %{name} modules directory have changed. -You need to restart some services to take care of -the new location (e.g. httpd, php-fpm). +======================================================= + WARNING : %{name} modules directory have changed. + You need to restart some services to take care of + the new location (e.g. httpd, php-fpm). +======================================================= EOF fi @@ -599,6 +606,9 @@ fi %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 7.1.2.0-2 +- ensure installation/update order (libs first) + * Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 7.1.2.0-1 - update to version 7.1.2 |