diff --git a/gimp.spec b/gimp.spec index b9479d4..967be2b 100644 --- a/gimp.spec +++ b/gimp.spec @@ -88,7 +88,7 @@ Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 Version: 2.10.14 -%global rel 2 +%global rel 3 Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist} # Compute some version related macros. @@ -215,6 +215,10 @@ Obsoletes: %{name}-unstable < %{epoch}:%{major}.%{minor} Conflicts: %{name}-unstable < %{epoch}:%{major}.%{minor} %endif +#Demodularizing of gimp (#1772469) +Obsoletes: %{name} < 2:2.10.14-3 +Conflicts: %{name} < 2:2.10.14-3 + Source0: http://download.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2 %if %{defined gitrev} @@ -250,6 +254,9 @@ License: LGPLv3+ Obsoletes: %{name}-unstable-libs < %{epoch}:%{major}.%{minor} Conflicts: %{name}-unstable-libs < %{epoch}:%{major}.%{minor} %endif +#Demodularizing of gimp (#1772469) +Obsoletes: %{name}-libs < 2:2.10.14-3 +Conflicts: %{name}-libs < 2:2.10.14-3 %description libs The %{name}-libs package contains shared libraries needed for the GNU Image @@ -268,6 +275,9 @@ Requires: rpm >= 4.11.0 Obsoletes: %{name}-unstable-devel < %{epoch}:%{major}.%{minor} Conflicts: %{name}-unstable-devel < %{epoch}:%{major}.%{minor} %endif +#Demodularizing of gimp (#1772469) +Obsoletes: %{name}-devel < 2:2.10.14-3 +Conflicts: %{name}-devel < 2:2.10.14-3 %description devel The %{name}-devel package contains the static libraries and header files @@ -282,6 +292,9 @@ Requires: %{name}-devel = %{epoch}:%{version}-%{release} Obsoletes: %{name}-unstable-devel-tools < %{epoch}:%{major}.%{minor} Conflicts: %{name}-unstable-devel-tools < %{epoch}:%{major}.%{minor} %endif +#Demodularizing of gimp (#1772469) +Obsoletes: %{name}-devel-tools < 2:2.10.14-3 +Conflicts: %{name}-devel-tools < 2:2.10.14-3 %description devel-tools The %{name}-devel-tools package contains gimptool, a helper program to @@ -296,6 +309,9 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: %{name}-unstable-help-browser < %{epoch}:%{major}.%{minor} Conflicts: %{name}-unstable-help-browser < %{epoch}:%{major}.%{minor} %endif +#Demodularizing of gimp (#1772469) +Obsoletes: %{name}-help-browser < 2:2.10.14-3 +Conflicts: %{name}-help-browser < 2:2.10.14-3 %description help-browser The %{name}-help-browser package contains a lightweight help browser plugin for @@ -703,6 +719,9 @@ make check %{?_smp_mflags} %endif %changelog +* Thu Jan 09 2020 Josef Ridky - 2:2.10.14-3 +- Demodularizing of gimp (#1772469) + * Mon Nov 18 2019 Kalev Lember - 2:2.10.14-2 - Rebuild for libmypaint 1.4.0