From de5d072067ee6986a0b954c1e6decfb75eeec5d2 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Nov 11 2023 12:31:32 +0000 Subject: Modernize and simplify runtime and build deps Mostly, depend on pkgconfig(*) instead of *-devel, also let the pkgconfig dependency generator do its thing. [skip changelog] Signed-off-by: Nils Philippsen --- diff --git a/gimp.spec b/gimp.spec index 9cfb2c4..20e2388 100644 --- a/gimp.spec +++ b/gimp.spec @@ -38,93 +38,80 @@ Release: %autorelease License: LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause URL: https://www.gimp.org/ BuildRequires: aalib-devel -BuildRequires: alsa-lib-devel >= 1.0.0 -BuildRequires: atk-devel >= 2.2.0 -BuildRequires: babl-devel >= 0.1.74 -BuildRequires: bzip2-devel -BuildRequires: cairo-devel >= 1.12.2 -BuildRequires: fontconfig-devel >= 2.12.4 -BuildRequires: freetype-devel >= 2.1.7 +BuildRequires: appdata-tools +BuildRequires: chrpath >= 0.13-5 BuildRequires: gcc -BuildRequires: gdk-pixbuf2-devel >= 2.30.8 BuildRequires: gegl04-tools -BuildRequires: gegl04-devel >= 0.4.32 -BuildRequires: libgs-devel -BuildRequires: glib2-devel >= 2.56.2 +BuildRequires: gettext >= 0.19 BuildRequires: glib-networking -BuildRequires: gtk2-devel >= 2.24.32 BuildRequires: gtk-doc >= 1.0 -BuildRequires: harfbuzz-devel >= 0.9.19 -BuildRequires: iso-codes-devel -BuildRequires: jasper-devel -BuildRequires: lcms2-devel >= 2.8 -BuildRequires: libappstream-glib -BuildRequires: libheif-devel -BuildRequires: libgexiv2-devel >= 0.10.6 -BuildRequires: libgudev1-devel >= 167 -BuildRequires: libjpeg-devel -BuildRequires: libjxl-devel >= 0.6.1 -BuildRequires: libmng-devel -BuildRequires: libpng-devel >= 1.6.25 -BuildRequires: librsvg2-devel >= 2.40.6 -BuildRequires: libtiff-devel -%if %{with libunwind} -BuildRequires: libunwind-devel >= 1.1.0 -%endif -BuildRequires: libwebp-devel >= 0.6.0 -BuildRequires: libwmf-devel >= 0.2.8 -BuildRequires: libmypaint-devel >= 1.3.0 -BuildRequires: mypaint-brushes-devel >= 1.3.0 -BuildRequires: openexr-devel -BuildRequires: imath-devel -BuildRequires: openjpeg2-devel >= 2.1.0 -BuildRequires: pango-devel >= 1.29.4 -BuildRequires: perl >= 5.10.0 -BuildRequires: poppler-glib-devel >= 0.50.0 -BuildRequires: poppler-data-devel >= 0.4.7 -BuildRequires: pycairo-devel >= 1.0.2 -BuildRequires: pygtk2-devel >= 2.10.4 -BuildRequires: pygobject2-devel -BuildRequires: python2-devel >= 2.5.0 -BuildRequires: webkitgtk-devel >= 1.6.1 -BuildRequires: xz-devel >= 5.0.0 -BuildRequires: zlib-devel -BuildRequires: libX11-devel -BuildRequires: libXmu-devel -BuildRequires: libXpm-devel - -BuildRequires: chrpath >= 0.13-5 BuildRequires: intltool >= 0.40.1 -BuildRequires: gettext >= 0.19 +BuildRequires: libgs-devel BuildRequires: make -BuildRequires: pkgconfig - -Requires: babl%{?_isa} >= 0.1.78 -Requires: gegl04%{?_isa} >= 0.4.32 -Requires: fontconfig >= 2.12.4 -Requires: freetype >= 2.1.7 -Requires: glib2 >= 2.56.2 -Requires: glib-networking -Requires: gtk2 >= 2.24.32 -Requires: hicolor-icon-theme +BuildRequires: perl >= 5.10.0 +BuildRequires: pkgconfig(alsa) >= 1.0.0 +BuildRequires: pkgconfig(atk) >= 2.2.0 +BuildRequires: pkgconfig(babl-0.1) >= 0.1.74 +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(cairo) >= 1.12.2 +BuildRequires: pkgconfig(fontconfig) >= 2.12.4 +BuildRequires: pkgconfig(freetype2) >= 2.1.7 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.8 +BuildRequires: pkgconfig(gegl-0.4) >= 0.4.32 +BuildRequires: pkgconfig(gexiv2) >= 0.10.6 +BuildRequires: pkgconfig(gio-2.0) >= 2.56.2 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.2 +BuildRequires: pkgconfig(glib-2.0) >= 2.56.2 +BuildRequires: pkgconfig(gmodule-no-export-2.0) >= 2.56.2 +BuildRequires: pkgconfig(gobject-2.0) >= 2.56.2 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.32 +BuildRequires: pkgconfig(gudev-1.0) >= 167 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.19 +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(jasper) +BuildRequires: pkgconfig(lcms2) >= 2.8 +BuildRequires: pkgconfig(libheif) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libjxl) >= 0.6.1 +BuildRequires: pkgconfig(libjxl_threads) >= 0.6.1 +BuildRequires: pkgconfig(liblzma) >= 5.0.0 +BuildRequires: pkgconfig(libmng) +BuildRequires: pkgconfig(libmypaint) >= 1.3.0 +BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 +BuildRequires: pkgconfig(libpng) >= 1.6.25 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6 +BuildRequires: pkgconfig(libtiff-4) %if %{with libunwind} -Requires: libunwind%{?_isa} >= 1.1.0 +BuildRequires: pkgconfig(libunwind) >= 1.1.0 %endif -Requires: lcms2 >= 2.8 +BuildRequires: pkgconfig(libwebp) >= 0.6.0 +BuildRequires: pkgconfig(libwebpdemux) >= 0.6.0 +BuildRequires: pkgconfig(libwebpmux) >= 0.6.0 +BuildRequires: pkgconfig(libwmf) >= 0.2.8 +BuildRequires: pkgconfig(mypaint-brushes-1.0) >= 1.3.0 +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(pangocairo) >= 1.29.4 +BuildRequires: pkgconfig(pangoft2) >= 1.29.4 +BuildRequires: pkgconfig(poppler-data) >= 0.4.7 +BuildRequires: pkgconfig(poppler-glib) >= 0.50.0 +BuildRequires: pkgconfig(pycairo) >= 1.0.2 +BuildRequires: pkgconfig(pygobject-2.0) +BuildRequires: pkgconfig(pygtk-2.0) >= 2.10.4 +BuildRequires: pkgconfig(python2) >= 2.5.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) + +Requires: hicolor-icon-theme Recommends: mypaint-brushes -Requires: pango >= 1.29.4 -Requires: pygtk2 >= 2.10.4 Requires: xdg-utils Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: %{name}-help-browser < %{epoch}:%{version}-%{release} Conflicts: %{name}-help-browser < %{epoch}:%{version}-%{release} -#Demodularizing of gimp (#1772469) -Obsoletes: %{name} < %{epoch}:%{version}-%{release} -Conflicts: %{name} < %{epoch}:%{version}-%{release} - #Remove dependency on RPM Fusion repository -Obsoletes: gimp-heif-plugin < 1.1.0-13 +Obsoletes: gimp-heif-plugin < 1.1.0-13 Source0: https://download.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 @@ -159,9 +146,6 @@ with multi-level undo. %package libs Summary: GIMP libraries License: LGPLv3+ -# Demodularizing of gimp (#1772469) -Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release} -Conflicts: %{name}-libs < %{epoch}:%{version}-%{release} %description libs The %{name}-libs package contains shared libraries needed for the GNU Image @@ -172,13 +156,6 @@ Summary: GIMP plugin and extension development kit License: LGPLv3+ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel-tools = %{epoch}:%{version}-%{release} -Requires: gtk2-devel -Requires: glib2-devel -Requires: pkgconfig -Requires: rpm >= 4.11.0 -# Demodularizing of gimp (#1772469) -Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release} -Conflicts: %{name}-devel < %{epoch}:%{version}-%{release} %description devel The %{name}-devel package contains the files needed for writing GNU Image @@ -188,9 +165,6 @@ Manipulation Program (GIMP) plug-ins and extensions. Summary: GIMP plugin and extension development tools License: LGPLv3+ Requires: %{name}-devel = %{epoch}:%{version}-%{release} -# Demodularizing of gimp (#1772469) -Obsoletes: %{name}-devel-tools < %{epoch}:%{version}-%{release} -Conflicts: %{name}-devel-tools < %{epoch}:%{version}-%{release} %description devel-tools The %{name}-devel-tools package contains gimptool, a helper program to