diff options
| -rw-r--r-- | ImageMagick6.spec | 85 |
1 files changed, 48 insertions, 37 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 360c1aa..b335455 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -53,19 +53,27 @@ %global libname ImageMagick %if 0%{?fedora} >= 25 -# No need to relocate, F25/26 same name, F27+ use ImageMagick-7 +# No need to relocate, same name %global move 0 %else %global move 1 %endif -%if 0%{?fedora} >= 25 && 0%{?fedora} <= 26 +%if 0%{?fedora} >= 27 +# ImageMagick 7 was briefly sent to Fedora 27 and Rawhide in 2017; +# the epoch was necessary to downgrade them back to 6. +Epoch: 1 +%else +Epoch: 0 +%endif + +%if 0%{?fedora} >= 25 Name: %{libname} %else Name: %{libname}6 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick @@ -111,18 +119,18 @@ BuildRequires: libraqm-devel BuildRequires: liblqr-1-devel %endif -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last < %{version} -Obsoletes: ImageMagick2-tools < %{version} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last < %{epoch}:%{version} +Obsoletes: ImageMagick2-tools < %{epoch}:%{version} %if "%{name}" != "%{libname}" # This could be improved in the future # https://bugzilla.redhat.com/849065 -Conflicts: %{libname} < %{version} -Provides: %{libname} = %{version}-%{release} -Provides: %{libname}%{?_isa} = %{version}-%{release} +Conflicts: %{libname} < %{epoch}:%{version} +Provides: %{libname} = %{epoch}:%{version}-%{release} +Provides: %{libname}%{?_isa} = %{epoch}:%{version}-%{release} %else -Obsoletes: %{libname}6 <= %{version}-%{release} +Obsoletes: %{libname}6 <= %{epoch}:%{version}-%{release} %endif # Filter private shared @@ -150,7 +158,7 @@ be installed together. %package devel Summary: Library links and header files for ImageMagick app development Group: Development/Libraries -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} @@ -171,12 +179,12 @@ Requires: openjpeg2-devel%{?_isa} Requires: jasper-devel%{?_isa} Requires: pkgconfig %if "%{name}" != "%{libname}" -Conflicts: %{libname}-devel < %{version} -Provides: %{libname}-devel = %{version}-%{release} -Provides: %{libname}-devel%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last-devel < %{version} +Conflicts: %{libname}-devel < %{epoch}:%{version} +Provides: %{libname}-devel = %{epoch}:%{version}-%{release} +Provides: %{libname}-devel%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last-devel < %{epoch}:%{version} %else -Obsoletes: %{libname}6-devel <= %{version}-%{release} +Obsoletes: %{libname}6-devel <= %{epoch}:%{version}-%{release} %endif %description devel @@ -211,10 +219,10 @@ for applications requiring this libraries. %package djvu Summary: DjVu plugin for ImageMagick Group: Applications/Multimedia -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last-djvu < %{version} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last-djvu < %{epoch}:%{version} %if "%{name}" == "%{libname}" -Obsoletes: %{libname}6-djvu <= %{version}-%{release} +Obsoletes: %{libname}6-djvu <= %{epoch}:%{version}-%{release} %endif %description djvu @@ -230,9 +238,9 @@ for applications requiring this libraries. %package doc Summary: ImageMagick html documentation Group: Documentation -Obsoletes: ImageMagick-last-doc < %{version} +Obsoletes: ImageMagick-last-doc < %{epoch}:%{version} %if "%{name}" == "%{libname}" -Obsoletes: %{libname}6-doc <= %{version}-%{release} +Obsoletes: %{libname}6-doc <= %{epoch}:%{version}-%{release} %endif %description doc @@ -248,15 +256,15 @@ http://www.imagemagick.org/ %package perl Summary: ImageMagick perl bindings Group: System Environment/Libraries -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} -Provides: %{libname}-perl = %{version}-%{release} -Provides: %{libname}-perl%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last-perl < %{version} +Conflicts: %{libname}-perl < %{epoch}:%{version} +Provides: %{libname}-perl = %{epoch}:%{version}-%{release} +Provides: %{libname}-perl%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last-perl < %{epoch}:%{version} %else -Obsoletes: %{libname}6-perl <= %{version}-%{release} +Obsoletes: %{libname}6-perl <= %{epoch}:%{version}-%{release} %endif %description perl @@ -269,10 +277,10 @@ ImageMagick. %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Group: System Environment/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last-c++ < %{version} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last-c++ < %{epoch}:%{version} %if "%{name}" == "%{libname}" -Obsoletes: %{libname}6-c++ <= %{version}-%{release} +Obsoletes: %{libname}6-c++ <= %{epoch}:%{version}-%{release} %endif %description c++ @@ -289,15 +297,15 @@ for applications requiring this libraries. %package c++-devel Summary: C++ bindings for the ImageMagick library Group: Development/Libraries -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} -Provides: %{libname}-c++-devel = %{version}-%{release} -Provides: %{libname}-c++-devel%{?_isa} = %{version}-%{release} -Obsoletes: ImageMagick-last-c++-devel < %{version} +Conflicts: %{libname}-c++-devel < %{epoch}:%{version} +Provides: %{libname}-c++-devel = %{epoch}:%{version}-%{release} +Provides: %{libname}-c++-devel%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: ImageMagick-last-c++-devel < %{epoch}:%{version} %else -Obsoletes: %{libname}6-c++-devel <= %{version}-%{release} +Obsoletes: %{libname}6-c++-devel <= %{epoch}:%{version}-%{release} %endif %description c++-devel @@ -557,6 +565,9 @@ fi %changelog +* Wed Sep 6 2017 Remi Collet <remi@remirepo.net> - 6.9.9.11-2 +- revert to v6 in F27+ + * Mon Sep 4 2017 Remi Collet <remi@remirepo.net> - 6.9.9.11-1 - update to version 6.9.9 patch level 11 |