F27 build as ImageMagick and obsoletes ImageMagick7

1 files changed, 29 insertions, 4 deletions

diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 7fff669..16fc8b7 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -60,13 +60,13 @@
 # No need to relocate for now, as ImageMagick-7 is not ImageMagick-6
 %global move    0
 
-%if 0%{?fedora} > 99
+%if 0%{?fedora} >= 27
 Name:           %{libname}
 %else
 Name:           %{libname}7
 %endif
 Version:        %{VER}.%{Patchlevel}
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -114,14 +114,16 @@ BuildRequires:  liblqr-1-devel
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
-Obsoletes:      ImageMagick2-tools     < 7
 %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}
+%else
+Obsoletes:      %{libname}7       <= %{version}-%{release}
 %endif
 
 # Filter private shared
@@ -172,8 +174,11 @@ Requires: pkgconfig
 %if "%{name}" != "%{libname}"
 Conflicts: %{libname}-devel         < %{version}
 Conflicts: %{libname}-last-devel    < %{version}
+Conflicts: %{libname}6-devel        < %{version}
 Provides:  %{libname}-devel         = %{version}-%{release}
 Provides:  %{libname}-devel%{?_isa} = %{version}-%{release}
+%else
+Obsoletes: %{libname}7-devel       <= %{version}-%{release}
 %endif
 
 %description devel
@@ -190,7 +195,9 @@ however.
 %package libs
 Summary: Commands for ImageMagick
 Group: Applications/Multimedia
-Obsoletes: ImageMagick2
+%if "%{name}" == "%{libname}"
+Obsoletes: %{libname}7-libs <= %{version}-%{release}
+%endif
 
 %description libs
 Provides the shared libraries and plugins of %{name}.
@@ -205,6 +212,9 @@ for applications requiring this libraries.
 Summary: DjVu plugin for ImageMagick
 Group: Applications/Multimedia
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%if "%{name}" == "%{libname}"
+Obsoletes: %{libname}7-djvu   <= %{version}-%{release}
+%endif
 
 %description djvu
 This packages contains a plugin for ImageMagick which makes it possible to
@@ -219,6 +229,9 @@ for applications requiring this libraries.
 %package doc
 Summary: ImageMagick html documentation
 Group: Documentation
+%if "%{name}" == "%{libname}"
+Obsoletes: %{libname}7-doc   <= %{version}-%{release}
+%endif
 
 %description doc
 ImageMagick documentation, this package contains usage (for the
@@ -238,8 +251,11 @@ 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}
+%else
+Obsoletes: %{libname}7-perl       <= %{version}-%{release}
 %endif
 
 %description perl
@@ -253,6 +269,9 @@ ImageMagick.
 Summary: ImageMagick Magick++ library (C++ bindings)
 Group: System Environment/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%if "%{name}" == "%{libname}"
+Obsoletes: %{libname}7-c++    <= %{version}-%{release}
+%endif
 
 %description c++
 This package contains the Magick++ library, a C++ binding to the ImageMagick
@@ -273,8 +292,11 @@ Requires: %{name}-devel%{?_isa} = %{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}
+%else
+Obsoletes: %{libname}7-c++-devel       <= %{version}-%{release}
 %endif
 
 %description c++-devel
@@ -512,6 +534,9 @@ make %{?_smp_mflags} check
 
 
 %changelog
+* Fri Aug 25 2017 Remi Collet <remi@remirepo.net> - 7.0.6.9-4
+- F27 build as ImageMagick and obsoletes ImageMagick7
+
 * Tue Aug 22 2017 Remi Collet <remi@remirepo.net> - 7.0.6.9-1
 - update to version 7.0.6 patch level 9