remove ancient obsoletes (#1002109)
This commit is contained in:
parent
2bec4bab0c
commit
9ec391edc0
11
gimp.spec
11
gimp.spec
@ -82,7 +82,7 @@ Summary: GNU Image Manipulation Program
|
|||||||
Name: gimp
|
Name: gimp
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 2.8.10
|
Version: 2.8.10
|
||||||
Release: %{?prerelprefix}5%{dotprerel}%{dotgitrev}%{?dist}
|
Release: %{?prerelprefix}6%{dotprerel}%{dotgitrev}%{?dist}
|
||||||
|
|
||||||
# Compute some version related macros.
|
# Compute some version related macros.
|
||||||
# Ugly, need to get quoting percent signs straight.
|
# Ugly, need to get quoting percent signs straight.
|
||||||
@ -111,8 +111,6 @@ License: GPLv3+
|
|||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
URL: http://www.gimp.org/
|
URL: http://www.gimp.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
|
||||||
Obsoletes: gimp-perl < 2:2.0
|
|
||||||
Obsoletes: gimp < 2:2.6.0-3
|
|
||||||
%if %{with aalib}
|
%if %{with aalib}
|
||||||
BuildRequires: aalib-devel
|
BuildRequires: aalib-devel
|
||||||
%endif
|
%endif
|
||||||
@ -192,9 +190,6 @@ Requires: hicolor-icon-theme
|
|||||||
Requires: pygtk2 >= 2.10.4
|
Requires: pygtk2 >= 2.10.4
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
%if ! %{with helpbrowser}
|
|
||||||
Obsoletes: gimp-help-browser <= %{?epoch:%{epoch}:}%{version}-%{release}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2
|
Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2
|
||||||
|
|
||||||
@ -268,7 +263,6 @@ Image Manipulation Program (GIMP) plug-ins and extensions.
|
|||||||
Summary: GIMP help browser plug-in
|
Summary: GIMP help browser plug-in
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Obsoletes: gimp < 2:2.6.0-3
|
|
||||||
Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
%description help-browser
|
%description help-browser
|
||||||
@ -659,6 +653,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 28 2014 Nils Philippsen <nils@redhat.com> - 2:2.8.10-6
|
||||||
|
- remove ancient obsoletes (#1002109)
|
||||||
|
|
||||||
* Thu Feb 13 2014 Nils Philippsen <nils@redhat.com> - 2:2.8.10-5
|
* Thu Feb 13 2014 Nils Philippsen <nils@redhat.com> - 2:2.8.10-5
|
||||||
- cope with freetype >= 2.5.1 include madness
|
- cope with freetype >= 2.5.1 include madness
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user