cleanup

1 files changed, 2 insertions, 12 deletions

diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index 29205d2..1037e09 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -105,8 +105,6 @@ BuildRequires:  liblqr-1-devel
 BuildRequires:  libgomp
 
 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
@@ -131,7 +129,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}"
@@ -166,7 +164,6 @@ Requires: pkgconfig
 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         < %{epoch}:%{version}-%{release}
 Provides:  %{libname}6-devel         = %{epoch}:%{version}-%{release}
@@ -174,7 +171,7 @@ Provides:  %{libname}6-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.
 
@@ -186,8 +183,6 @@ however.
 
 %package libs
 Summary: ImageMagick library
-Obsoletes: ImageMagick2          < %{epoch}:%{version}
-Obsoletes: ImageMagick-last-libs < %{epoch}:%{version}
 %if "%{name}" == "%{libname}"
 Obsoletes: %{libname}6-libs     <= %{epoch}:%{version}-%{release}
 %endif
@@ -211,7 +206,6 @@ for applications requiring this libraries.
 Summary: DjVu plugin for ImageMagick
 BuildRequires:  pkgconfig(ddjvuapi)
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Obsoletes: ImageMagick-last-djvu < %{epoch}:%{version}
 %if "%{name}" == "%{libname}"
 Obsoletes: %{libname}6-djvu     <= %{epoch}:%{version}-%{release}
 %endif
@@ -252,7 +246,6 @@ for applications requiring this libraries.
 %package doc
 Summary: ImageMagick html documentation
 BuildRequires:  doxygen
-Obsoletes: ImageMagick-last-doc < %{epoch}:%{version}
 %if "%{name}" == "%{libname}"
 Obsoletes: %{libname}6-doc     <= %{epoch}:%{version}-%{release}
 %endif
@@ -275,7 +268,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $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       <= %{epoch}:%{version}-%{release}
 %endif
@@ -290,7 +282,6 @@ ImageMagick.
 %package c++
 Summary: ImageMagick Magick++ library (C++ bindings)
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Obsoletes: ImageMagick-last-c++ < %{epoch}:%{version}
 %if "%{name}" == "%{libname}"
 Obsoletes: %{libname}6-c++     <= %{epoch}:%{version}-%{release}
 %endif
@@ -314,7 +305,6 @@ Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
 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       <= %{epoch}:%{version}-%{release}
 %endif