summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-08-12 15:26:04 +0200
committerRemi Collet <remi@php.net>2024-08-12 15:26:04 +0200
commitceaa16ed07477adddd43ff228750fdbaa5d74e9e (patch)
treeea6b12849dc8038754d074e9bac84b582bca2c5d
parent36ed57fc6d88976d95e6f11054a87055c0ca96cd (diff)
cleanup
-rw-r--r--ImageMagick7.spec10
1 files changed, 2 insertions, 8 deletions
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 299eeaa..c748e55 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -127,10 +127,7 @@ BuildRequires: open-sans-fonts
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" != "%{libname}"
-# This could be improved in the future
-# https://bugzilla.redhat.com/849065
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}
@@ -151,7 +148,7 @@ reduce, or add special effects to an image, and when finished you can
either save the completed work in the original format or a different
one.
-ImageMagick-last includes the command line programs for creating animated or
+%{name} includes the command line programs for creating animated or
transparent .gifs, creating composite images, creating thumbnail images,
and more.
%if "%{name}" != "%{libname}"
@@ -184,7 +181,6 @@ Requires: jasper-devel%{?_isa}
Requires: pkgconfig
%if "%{name}" != "%{libname}"
Conflicts: %{libname}-devel < %{epoch}:%{version}
-Conflicts: %{libname}-last-devel < %{epoch}:%{version}
Conflicts: %{libname}6-devel < %{epoch}:%{version}
Provides: %{libname}-devel = %{epoch}:%{version}-%{release}
Provides: %{libname}-devel%{?_isa} = %{epoch}:%{version}-%{release}
@@ -195,7 +191,7 @@ Provides: %{libname}7-devel%{?_isa} = %{epoch}:%{version}-%{release}
%endif
%description devel
-ImageMagick-last-devel contains the library links and header files you'll
+%{name}-devel contains the library links and header files you'll
need to develop ImageMagick applications. ImageMagick is an image
manipulation program.
@@ -290,7 +286,6 @@ Requires: %{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}-last-perl < %{epoch}:%{version}
Conflicts: %{libname}6-perl < %{epoch}:%{version}
Provides: %{libname}-perl = %{epoch}:%{version}-%{release}
Provides: %{libname}-perl%{?_isa} = %{epoch}:%{version}-%{release}
@@ -329,7 +324,6 @@ Requires: %{name}-c++%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
%if "%{name}" != "%{libname}"
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}