3.0.2

(cherry picked from commit 8b66b7cdf9d06af4b7f2eaf63783ca3541fb02fe)
2025-05-07 09:41:59 +08:00 · 2025-05-07 09:41:59 +08:00 · 39940098c1
commit 39940098c1
parent 694854d9f8
13 changed files with 318 additions and 312 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+*.xz filter=lfs diff=lfs merge=lfs -text
--- a/.lfsconfig
+++ b/.lfsconfig
@ -0,0 +1,2 @@
+[lfs]
+	url = https://artlfs.openeuler.openatom.cn/src-openEuler/gimp
--- a/CVE-2025-2761.patch
+++ b/CVE-2025-2761.patch
@ -1,35 +0,0 @@
-From 0806bc76ca74543d20e1307ccf6aebd26395c56c Mon Sep 17 00:00:00 2001
-From: Alx Sa <cmyk.student@gmail.com>
-Date: Mon, 10 Mar 2025 04:07:44 +0000
-Subject: [PATCH] plug-ins: Fix ZDI-CAN-25100 for FLI plug-in
-
-Origin: https://gitlab.gnome.org/GNOME/gimp/-/commit/0806bc76ca74543d20e1307ccf6aebd26395c56c
-
-Resolves #13073
-This patch adds a check to make sure we're not
-writing beyond the bounds of the "pos" array.
-This is the same check that we do earlier when
-writing pos[xc++], but it was left off of the last
-write command. Since "n" will be 0 if we get to the
-end of the array, it prevents us from writing beyond
-that.
---
- plug-ins/file-fli/fli.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
-index 85dcc994395..1aba31e8f90 100644
--- a/plug-ins/file-fli/fli.c
-+++ b/plug-ins/file-fli/fli.c
-@@ -1529,7 +1529,7 @@ fli_read_lc_2 (FILE          *f,
-               xc += len << 1;
-             }
-         }
-      if (lpf)
-+      if (lpf && xc < n)
-         pos[xc] = lpn;
-       yc++;
-     }
-- 
-GitLab
-
--- a/10
+++ b/10
@ -1,10 +0,0 @@
-Currently active maintainers
----------------------------
-
-Michael Natterer
-E-mail: mitch@gimp.org
-Userid: mitch
-
-Jehan
-E-mail: jehan@girinstud.io
-Userid: Jehan
--- a/adapted-babl.patch
+++ b/adapted-babl.patch
@ -1,28 +0,0 @@
-From a0b20d74c25211d32fdf9579f98aed36d3f8cb9d Mon Sep 17 00:00:00 2001
-From: cherry530 <707078654@qq.com>
-Date: Wed, 18 Oct 2023 17:06:28 +0800
-Subject: [PATCH] adapted babl
-
-Signed-off-by: cherry530 <707078654@qq.com>
---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d6420c..41981ab 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -720,8 +720,8 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
- # Checks for required libraries
- ###############################
- 
-PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],,
-                  [add_deps_error([babl >= babl_required_version])])
-+PKG_CHECK_MODULES(BABL, [babl-0.1 >= babl_required_version],,
-+                  [add_deps_error([babl-0.1 >= babl_required_version])])
- PKG_CHECK_MODULES(GEGL, gegl-gegl_major_minor_version >= gegl_required_version,,
-                   [add_deps_error([gegl-gegl_major_minor_version >= gegl_required_version])])
- PKG_CHECK_MODULES(ATK, atk >= atk_required_version,,
-- 
-2.27.0
-
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,2 +0,0 @@
-libgimp-2_0-0
-libgimpui-2_0-0
--- a/gimp-2.99.10.tar.bz2
+++ b/gimp-2.99.10.tar.bz2
--- a/gimp-3.0.2.tar.xz
+++ b/gimp-3.0.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:546ddc30cb2d0e79123c7fcb4d78211e1ee7a6aace91a6a0ad8cbcbf6ea571a2
+size 27019468
--- a/1
+++ b/1
@ -1 +0,0 @@
-addFilter('shlib-fixed-dependency')
--- a/gimp.spec
+++ b/gimp.spec
@ -1,10 +1,7 @@
-%define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
-
-
 %define alsa_version            1.0.0
 %define appstream_glib_version  0.7.7
 %define atk_version             2.4.0
-%define babl_version            0.1.82
+%define babl_version            0.1.112
 %define cairo_version           1.14.0
 %define cairo_pdf_version       1.12.2
 %define dbus_glib_version       0.70
@ -12,7 +9,7 @@
 %define fontconfig_version      2.12.4
 %define freetype2_version       2.1.7
 %define gdk_pixbuf_version      2.30.8
-%define gegl04_version          0.4.26
+%define gegl04_version          0.4.58
 %define gexiv2_version          0.10.6
 %define glib_version            2.56.2
 %define gtk3_version            3.22.29
@ -20,7 +17,7 @@
 %define harfbuzz_version        1.0.5
 %define lcms2_version           2.8
 %define libexif_version         0.6.15
-%define libheif_version         1.5.2
+%define libheif_version         1.15.1
 %define liblzma_version         5.0.0
 %define libmypaint_version      1.4.0
 %define libopenjp2_version      2.1.0
@ -35,41 +32,23 @@
 %define poppler_glib_version    0.69.0
 %define vapigen_version         0.40.0
 %define libvala_version         0.40.0
-%define webkit2gtk_version      2.20.3
-
-%global abiver 5
-%global apiver 3.0

 Name:           gimp
-Version:        2.99.10
-Release:        3
+Version:        3.0.2
+Release:        1
 Epoch:          2
 Summary:        The GNU Image Manipulation Program
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
 URL:            https://www.gimp.org/
-Source:         https://download.gimp.org/mirror/pub/gimp/v2.99/%{name}-%{version}.tar.bz2
-Source1:        macros.gimp
-Source2:        MAINTAINERS
-Source98:       gimp-rpmlintrc
-Source99:       baselibs.conf
-Patch0:         git_info_from_dirname.patch
-Patch1:         adapted-babl.patch
-Patch2:         CVE-2025-2761.patch
-BuildRequires:  autoconf glibc-all-langpacks
-BuildRequires:  automake
-BuildRequires:  libtool
+Source:         https://download.gimp.org/mirror/pub/gimp/v3.0/%{name}-%{version}.tar.xz
+BuildRequires:  meson >= 0.61.0
 BuildRequires:  aalib-devel
 BuildRequires:  babl-vala >= %{babl_version}
-BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gegl04 >= %{gegl04_version}
 BuildRequires:  ghostscript-devel
 BuildRequires:  glib-networking
-BuildRequires:  gtk-doc
-BuildRequires:  intltool >= 0.40.1
 BuildRequires:  libwmf-devel >= 0.2.8
-BuildRequires:  pkgconfig
 BuildRequires:  python3 >= 3.6.0
 BuildRequires:  python3-gobject
 BuildRequires:  xdg-utils
@ -81,6 +60,7 @@ BuildRequires:  pkgconfig(babl-0.1) >= %{babl_version}
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(cairo) >= %{cairo_version}
 BuildRequires:  pkgconfig(cairo-pdf) >= %{cairo_pdf_version}
+BuildRequires:  pkgconfig(cfitsio)
 BuildRequires:  pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
 BuildRequires:  pkgconfig(fontconfig) >= %{fontconfig_version}
 BuildRequires:  pkgconfig(freetype2) >= %{freetype2_version}
@ -114,7 +94,6 @@ BuildRequires:  pkgconfig(poppler-data) >= %{poppler_data_version}
 BuildRequires:  pkgconfig(poppler-glib) >= %{poppler_glib_version}
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(vapigen) >= %{vapigen_version}
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xext)
@ -122,21 +101,45 @@ BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(zlib)
-BuildRequires:  autoconf  libtool   gettext-devel chrpath
-BuildRequires:  ncurses-devel ncurses-libs slang-devel gpm-devel gpm-libs
-%requires_eq    gegl-0_4
+BuildRequires:  /usr/bin/appstreamcli
+BuildRequires:  /usr/bin/gi-docgen
+BuildRequires:  /usr/bin/xsltproc
+BuildRequires:  gettext-devel
+BuildRequires:  ncurses-devel slang-devel gpm-devel
 Requires:       gjs
-Requires:       libgimp-3_0-0 = %{epoch}:%{version}
-Requires:       libgimpui-3_0-0 = %{epoch}:%{version}
+Requires:       %{name}-libs = %{epoch}:%{version}
 Requires:       luajit
 Requires:       shared-mime-info
 Requires:       xdg-utils
 Recommends:     %{name}-plugins-python3 = %{epoch}:%{version}
 Recommends:     iso-codes
 Suggests:       AdobeICCProfiles
-Provides:       gimp-2.0 = %{epoch}:%{version}
-Provides:       gimp(abi) = %{abiver}
-Provides:       gimp(api) = %{apiver}
+
+%global plain_version %{lua:
+    local non_snapshot_version = (string.gsub(macros.version, '^(.*)%^.*$', '%1'))
+    if non_snapshot_version ~= macros.version then
+        macros.snapshot = (string.gsub(macros.version, '^.*%^(.*)$', '%1'))
+        macros.git_rev = (string.gsub(macros.snapshot, '^.*git(.*)$', '%1'))
+    end
+    local plain_version = (string.gsub(non_snapshot_version, "~", "-"))
+    print(plain_version)
+}
+%global major %{lua:
+    print((string.gsub(macros.plain_version, '^(%d+)%..*$', '%1')))
+}
+%global minor %{lua:
+    print((string.gsub(macros.plain_version, '^%d+%.(%d+)%..*$', '%1')))
+}
+%global micro %{lua:
+    print((string.gsub(macros.plain_version, '^%d+%.%d+%.(%d+).*$', '%1')))
+}
+%global bin_version %{major}.%{minor}
+%global interface_age 0
+%global gettext_version %{major}0
+%global api_version %{major}.0
+%global lib_api_version %{major}.0
+%global lib_minor %{lua: print(tonumber(macros.minor) * 100)}
+%global lib_micro %micro

 %description
 The GIMP is an image composition and editing program, which can be
@ -147,32 +150,21 @@ effects, subpixel imaging and antialiasing, and conversions, together
 with multilevel undo. The GIMP offers a scripting facility, but many
 of the included scripts rely on fonts that we cannot distribute.

-%package -n libgimp-3_0-0
+%package libs
 Summary:        The GNU Image Manipulation Program - Libraries
+Obsoletes:      libgimp-3_0-0 < %{epoch}:%{version}-%{release}
+Obsoletes:      libgimpui-3_0-0 < %{epoch}:%{version}-%{release}
+Requires:       libgegl-0_4-0%{?_isa} >= %{gegl04_version}
+Requires:       babl%{_isa} >= %{babl_version}
 Group:          System/Libraries

-%requires_file %{_libdir}/libbabl-0.1.so
-%requires_file %{_libdir}/libgegl-0.4.so
-%requires_file %{_libdir}/libgexiv2.so
-
-%description -n libgimp-3_0-0
+%description libs
 The GIMP is an image composition and editing program. GIMP offers
 many tools and filters, and provides a large image manipulation
 toolbox and scripting.

 This package provides GIMP libraries.

-%package -n libgimpui-3_0-0
-Summary:        The GNU Image Manipulation Program - UI Libraries
-Group:          System/Libraries
-
-%description -n libgimpui-3_0-0
-The GIMP is an image composition and editing program. GIMP offers
-many tools and filters, and provides a large image manipulation
-toolbox and scripting.
-
-This package provides GIMP UI libraries.
-
 %package plugin-python3
 Summary:        The GNU Image Manipulation Program - python3 goject introspection plugins
 Group:          Productivity/Graphics/Bitmap Editors
@ -182,6 +174,7 @@ Requires:       python3-gobject
 Supplements:    %{name}
 Provides:       gimp-plugins-python3 = %{epoch}:%{version}-%{release}
 Obsoletes:      gimp-plugins-python3 < %{epoch}:%{version}-%{release}
+
 %description plugin-python3
 The GIMP is an image composition and editing program. GIMP offers
 many tools and filters, and provides a large image manipulation
@ -211,9 +204,7 @@ toolbox and scripting.
 %package devel
 Summary:        The GNU Image Manipulation Program
 Group:          Development/Libraries/Other
-Requires:       libgimp-3_0-0 = %{epoch}:%{version}
-Requires:       libgimpui-3_0-0 = %{epoch}:%{version}
-Provides:       gimp-devel = %{epoch}:%{version}
+Requires:       %{name}-libs = %{epoch}:%{version}
 Provides:       gimp-doc = 2.6.4
 Obsoletes:      gimp-doc < 2.6.4
 Obsoletes:      gimp-unstable-devel < 2.6.0
@ -229,7 +220,7 @@ applications that want to make use of the GIMP libraries.
 %package extension-goat-excercises
 Summary:        The GNU Image Manipulation Program
 Group:          Development/Libraries/Other
-Requires:       libgimpui-3_0-0 = %{epoch}:%{version}
+Requires:       %{name}-libs = %{epoch}:%{version}
 Requires:       gimp-vala = %{epoch}:%{version}
 Requires:       gimp-devel = %{epoch}:%{version}
 Requires:       gimp-plugin-python3 = %{epoch}:%{version}
@ -242,182 +233,297 @@ toolbox and scripting.
 This subpackage contains example the goat extension examples
 that extend gimp.

-
-
 %prep
 %autosetup -p1
-rm -rf configure
-libtoolize --force
-autoreconf --force --install
-cp %{SOURCE2} .

 %build
-%define _lto_cflags %{nil}
-
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7"
-test -x "$(type -p %{_bindir}/g++-7)" && export CXX="%{_bindir}/g++-7"
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-%configure \
-	--disable-silent-rules \
-	--disable-static\
-	--libexecdir=%{_prefix}/lib\
-	--enable-default-binary\
-    --enable-binreloc \
-	--enable-mp
-
-# Safety check for ABI version change.
-vabi=$(printf "%%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h))
-if test "x${vabi}" != "x%{abiver}"; then
-   : Error: Upstream ABI version is now ${vabi}, expecting %{abiver}.
-   : Update the apiver macro and rebuild.
-   exit 1
-fi
-# Safety check for API version change.
-vapi=$(sed -n '/#define GIMP_API_VERSION/{s/.* //;p}' libgimpbase/gimpversion.h | sed -e 's@"@@g')
-if test "x${vapi}" != "x%{apiver}"; then
-   : Error: Upstream API version is now ${vapi}, expecting %{apiver}.
-   : Update the apiver macro and rebuild.
-   exit 1
-fi
-
-%make_build
+%meson \
+    -Dilbm=disabled \
+    -Djpeg-xl=disabled \
+    -Dheif=disabled \
+    -Dheadless-tests=disabled \
+    -Dbug-report-url='https://www.openeuler.org' \
+%{nil}
+%meson_build

 %install
-%make_install
-rm %{buildroot}%{_libdir}/gimp/2.99/*/*.*a
-touch gimp_all_parts.lang
-for lang_part in gimp30 gimp30-libgimp gimp30-python gimp30-script-fu gimp30-std-plug-ins ; do
-%find_lang ${lang_part} %{?no_lang_C} ${lang_part}.lang
-cat ${lang_part}.lang >> gimp_all_parts.lang
-done
-echo "%%defattr(-,root,root)" >plugins.list
-echo "%%defattr(-,root,root)" >plugins-python.list
-for PLUGIN in %{buildroot}%{_libdir}/gimp/2.99/plug-ins/* ; do
-    if grep -q '^#!.*python' ${PLUGIN}/* ; then
-	echo "${PLUGIN#%{buildroot}}" >>plugins-python.list
-    else
-	echo "${PLUGIN#%{buildroot}}" >>plugins.list
-    fi
-done
-cat gimp_all_parts.lang >> plugins.list
-find %{buildroot} -type f -name "*.la" -delete -print
-install -d %{buildroot}%{_sysconfdir}/rpm
-sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \
-    < $RPM_SOURCE_DIR/macros.gimp > macros.gimp
-install -m 644 -c macros.gimp \
-           %{buildroot}%{_sysconfdir}/rpm/macros.gimp
-chrpath -d %{buildroot}/usr/lib64/gimp/2.99/plug-ins/file-aa/file-aa
+%meson_install

-%fdupes %{buildroot}%{_datadir}/gtk-doc/
-%fdupes %{buildroot}%{_libdir}/gimp/2.99/python/
-%fdupes %{buildroot}%{_datadir}/gimp/2.99/
+%find_lang gimp%{gettext_version}
+%find_lang gimp%{gettext_version}-libgimp
+%find_lang gimp%{gettext_version}-python
+%find_lang gimp%{gettext_version}-script-fu
+%find_lang gimp%{gettext_version}-std-plug-ins
+%find_lang org.gimp.extension.goat-exercises

-%post -n libgimp-3_0-0 -p /sbin/ldconfig
-%postun -n libgimp-3_0-0 -p /sbin/ldconfig
-%post -n libgimpui-3_0-0 -p /sbin/ldconfig
-%postun -n libgimpui-3_0-0 -p /sbin/ldconfig
+# Generate RPM macros from pkg-config data:
+# %%_gimp_datadir -- toplevel directory for brushes, gradients, scripts, ...
+# %%_gimp_libdir -- toplevel directory for modules, plug-ins, ...
+# %%_gimp_sysconfdir -- system-wide runtime configuration
+# %%_gimp_localedir -- toplevel directory for translation files
+# %%_gimp_scriptdir -- script-fu scripts directory
+# %%_gimp_plugindir -- plug-in directory
+gimp_pc_extract_normalize() {
+    PKG_CONFIG_PATH="%{buildroot}%{_libdir}/pkgconfig" \
+        pkg-config --variable="$1" gimp-%{lib_api_version} | \
+    sed \
+        -e 's|^%_mandir|%%{_mandir}|' \
+        -e 's|^%_infodir|%%{_infodir}|' \
+        -e 's|^%_includedir|%%{_includedir}|' \
+        -e 's|^%_libdir|%%{_libdir}|' \
+        -e 's|^%_localstatedir|%%{_localstatedir}|' \
+        -e 's|^%_sharedstatedir|%%{_sharedstatedir}|' \
+        -e 's|^%_sysconfdir|%%{_sysconfdir}|' \
+        -e 's|^%_datadir|%%{_datadir}|' \
+        -e 's|^%_libexecdir|%%{_libexecdir}|' \
+        -e 's|^%_sbindir|%%{_sbindir}|' \
+        -e 's|^%_bindir|%%{_bindir}|' \
+        -e 's|^%_exec_prefix|%%{_exec_prefix}|' \
+        -e 's|^%_prefix|%%{_prefix}|'
+}
 
-%files -f plugins.list
+_gimp_datadir="$(gimp_pc_extract_normalize gimpdatadir)"
+_gimp_libdir="$(gimp_pc_extract_normalize gimplibdir)"
+_gimp_sysconfdir="$(gimp_pc_extract_normalize gimpsysconfdir)"
+_gimp_localedir="$(gimp_pc_extract_normalize gimplocaledir)"
+_gimp_scriptdir="${_gimp_datadir}/scripts"
+_gimp_plugindir="${_gimp_libdir}/plug-ins"
+ 
+cat << EOF > macros.gimp
+# RPM macros for GIMP
+ 
+%%_gimp_datadir ${_gimp_datadir}
+%%_gimp_libdir ${_gimp_libdir}
+%%_gimp_sysconfdir ${_gimp_sysconfdir}
+%%_gimp_localedir ${_gimp_localedir}
+%%_gimp_scriptdir ${_gimp_scriptdir}
+%%_gimp_plugindir ${_gimp_plugindir}
+EOF
+ 
+install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp
+
+%files -f gimp%{gettext_version}.lang -f gimp%{gettext_version}-script-fu.lang -f gimp%{gettext_version}-std-plug-ins.lang
 %license COPYING LICENSE
-%doc AUTHORS NEWS* README MAINTAINERS devel-docs/HACKING.md
+%doc AUTHORS NEWS* README
 %{_bindir}/gimp
-%{_bindir}/gimp-2.*
+%{_bindir}/gimp-%{major}
+%{_bindir}/gimp-%{api_version}
 %{_bindir}/gimp-console
-%{_bindir}/gimp-console-2.*
-%{_bindir}/gimp-test-clipboard-2.99
-%{_prefix}/lib/gimp-debug-tool-2.99
-%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/gimp-data-extras.metainfo.xml
+%{_bindir}/gimp-console-%{major}
+%{_bindir}/gimp-console-%{api_version}
+%{_bindir}/gimp-script-fu-interpreter-%{api_version}
+%{_bindir}/gimp-test-clipboard
+%{_bindir}/gimp-test-clipboard-%{major}
+%{_bindir}/gimp-test-clipboard-%{api_version}
+%{_libexecdir}/gimp-debug-tool
+%{_libexecdir}/gimp-debug-tool-%{major}
+%{_libexecdir}/gimp-debug-tool-%{api_version}
 %{_datadir}/metainfo/org.gimp.GIMP.appdata.xml
 %{_datadir}/applications/gimp.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/*/apps/*.svg
-%{_datadir}/gimp/
-%{_libdir}/gimp/2.99/environ/default.env
-%{_libdir}/gimp/2.99/interpreters/default.interp
-%{_libdir}/gimp/2.99/modules/libcolor-selector-cmyk.so
-%{_libdir}/gimp/2.99/modules/libcolor-selector-water.so
-%{_libdir}/gimp/2.99/modules/libcolor-selector-wheel.so
-%{_libdir}/gimp/2.99/modules/libcontroller-linux-input.so
-%{_libdir}/gimp/2.99/modules/libcontroller-midi.so
-%{_libdir}/gimp/2.99/modules/libdisplay-filter-aces-rrt.so
-%{_libdir}/gimp/2.99/modules/libdisplay-filter-clip-warning.so
-%{_libdir}/gimp/2.99/modules/libdisplay-filter-color-blind.so
-%{_libdir}/gimp/2.99/modules/libdisplay-filter-gamma.so
-%{_libdir}/gimp/2.99/modules/libdisplay-filter-high-contrast.so
-%{_mandir}/man?/gimp.*
-%{_mandir}/man?/gimp-2*
-%{_mandir}/man?/gimp-console.*
-%{_mandir}/man?/gimp-console-2*
-%{_mandir}/man?/gimprc.*
-%{_mandir}/man?/gimprc-2*
-%{_mandir}/man?/gimptool-2*
-%dir %{_sysconfdir}/gimp
-%dir %{_sysconfdir}/gimp/2.99
-%config %{_sysconfdir}/gimp/2.99/*rc
-%config %{_sysconfdir}/gimp/2.99/*css
-%exclude %{_libdir}/gimp/2.99/plug-ins/file-aa
+%{_datadir}/gimp/%{api_version}/*
+%{_libdir}/gimp/%{api_version}/environ/default.env
+%{_libdir}/gimp/%{api_version}/interpreters/default.interp
+%{_libdir}/gimp/%{api_version}/modules/libcolor-selector-cmyk.so
+%{_libdir}/gimp/%{api_version}/modules/libcolor-selector-water.so
+%{_libdir}/gimp/%{api_version}/modules/libcolor-selector-wheel.so
+%{_libdir}/gimp/%{api_version}/modules/libcontroller-linux-input.so
+%{_libdir}/gimp/%{api_version}/modules/libcontroller-midi.so
+%{_libdir}/gimp/%{api_version}/modules/libdisplay-filter-aces-rrt.so
+%{_libdir}/gimp/%{api_version}/modules/libdisplay-filter-clip-warning.so
+%{_libdir}/gimp/%{api_version}/modules/libdisplay-filter-color-blind.so
+%{_libdir}/gimp/%{api_version}/modules/libdisplay-filter-gamma.so
+%{_libdir}/gimp/%{api_version}/modules/libdisplay-filter-high-contrast.so
+%{_libdir}/gimp/%{api_version}/plug-ins/align-layers
+%{_libdir}/gimp/%{api_version}/plug-ins/animation-optimize
+%{_libdir}/gimp/%{api_version}/plug-ins/animation-play
+%{_libdir}/gimp/%{api_version}/plug-ins/blinds
+%{_libdir}/gimp/%{api_version}/plug-ins/border-average
+%{_libdir}/gimp/%{api_version}/plug-ins/busy-dialog
+%{_libdir}/gimp/%{api_version}/plug-ins/checkerboard
+%{_libdir}/gimp/%{api_version}/plug-ins/cml-explorer
+%{_libdir}/gimp/%{api_version}/plug-ins/colormap-remap
+%{_libdir}/gimp/%{api_version}/plug-ins/compose
+%{_libdir}/gimp/%{api_version}/plug-ins/contrast-retinex
+%{_libdir}/gimp/%{api_version}/plug-ins/crop-zealous
+%{_libdir}/gimp/%{api_version}/plug-ins/curve-bend
+%{_libdir}/gimp/%{api_version}/plug-ins/decompose
+%{_libdir}/gimp/%{api_version}/plug-ins/depth-merge
+%{_libdir}/gimp/%{api_version}/plug-ins/despeckle
+%{_libdir}/gimp/%{api_version}/plug-ins/destripe
+%{_libdir}/gimp/%{api_version}/plug-ins/file-bmp
+%{_libdir}/gimp/%{api_version}/plug-ins/file-cel
+%{_libdir}/gimp/%{api_version}/plug-ins/file-compressor
+%{_libdir}/gimp/%{api_version}/plug-ins/file-csource
+%{_libdir}/gimp/%{api_version}/plug-ins/file-darktable
+%{_libdir}/gimp/%{api_version}/plug-ins/file-dds
+%{_libdir}/gimp/%{api_version}/plug-ins/file-desktop-link
+%{_libdir}/gimp/%{api_version}/plug-ins/file-dicom
+%{_libdir}/gimp/%{api_version}/plug-ins/file-exr
+%{_libdir}/gimp/%{api_version}/plug-ins/file-farbfeld
+%{_libdir}/gimp/%{api_version}/plug-ins/file-faxg3
+%{_libdir}/gimp/%{api_version}/plug-ins/file-fits
+%{_libdir}/gimp/%{api_version}/plug-ins/file-fli
+%{_libdir}/gimp/%{api_version}/plug-ins/file-gbr
+%{_libdir}/gimp/%{api_version}/plug-ins/file-gegl
+%{_libdir}/gimp/%{api_version}/plug-ins/file-gif-export
+%{_libdir}/gimp/%{api_version}/plug-ins/file-gif-load
+%{_libdir}/gimp/%{api_version}/plug-ins/file-gih
+%{_libdir}/gimp/%{api_version}/plug-ins/file-glob
+%{_libdir}/gimp/%{api_version}/plug-ins/file-header
+%{_libdir}/gimp/%{api_version}/plug-ins/file-html-table
+%{_libdir}/gimp/%{api_version}/plug-ins/file-icns
+%{_libdir}/gimp/%{api_version}/plug-ins/file-ico
+%{_libdir}/gimp/%{api_version}/plug-ins/file-jp2-load
+%{_libdir}/gimp/%{api_version}/plug-ins/file-jpeg
+%{_libdir}/gimp/%{api_version}/plug-ins/file-mng
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pat
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pcx
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pdf-export
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pdf-load
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pix
+%{_libdir}/gimp/%{api_version}/plug-ins/file-png
+%{_libdir}/gimp/%{api_version}/plug-ins/file-pnm
+%{_libdir}/gimp/%{api_version}/plug-ins/file-ps
+%{_libdir}/gimp/%{api_version}/plug-ins/file-psd
+%{_libdir}/gimp/%{api_version}/plug-ins/file-psp
+%{_libdir}/gimp/%{api_version}/plug-ins/file-raw-data
+%{_libdir}/gimp/%{api_version}/plug-ins/file-raw-placeholder
+%{_libdir}/gimp/%{api_version}/plug-ins/file-rawtherapee
+%{_libdir}/gimp/%{api_version}/plug-ins/file-sgi
+%{_libdir}/gimp/%{api_version}/plug-ins/file-sunras
+%{_libdir}/gimp/%{api_version}/plug-ins/file-svg
+%{_libdir}/gimp/%{api_version}/plug-ins/file-tga
+%{_libdir}/gimp/%{api_version}/plug-ins/file-tiff
+%{_libdir}/gimp/%{api_version}/plug-ins/file-wbmp
+%{_libdir}/gimp/%{api_version}/plug-ins/file-webp
+%{_libdir}/gimp/%{api_version}/plug-ins/file-wmf
+%{_libdir}/gimp/%{api_version}/plug-ins/file-xbm
+%{_libdir}/gimp/%{api_version}/plug-ins/file-xmc
+%{_libdir}/gimp/%{api_version}/plug-ins/file-xpm
+%{_libdir}/gimp/%{api_version}/plug-ins/file-xwd
+%{_libdir}/gimp/%{api_version}/plug-ins/film
+%{_libdir}/gimp/%{api_version}/plug-ins/flame
+%{_libdir}/gimp/%{api_version}/plug-ins/fractal-explorer
+%{_libdir}/gimp/%{api_version}/plug-ins/gfig
+%{_libdir}/gimp/%{api_version}/plug-ins/gimpressionist
+%{_libdir}/gimp/%{api_version}/plug-ins/gradient-flare
+%{_libdir}/gimp/%{api_version}/plug-ins/gradient-map
+%{_libdir}/gimp/%{api_version}/plug-ins/grid
+%{_libdir}/gimp/%{api_version}/plug-ins/guillotine
+%{_libdir}/gimp/%{api_version}/plug-ins/help
+%{_libdir}/gimp/%{api_version}/plug-ins/hot
+%{_libdir}/gimp/%{api_version}/plug-ins/ifs-compose
+%{_libdir}/gimp/%{api_version}/plug-ins/imagemap
+%{_libdir}/gimp/%{api_version}/plug-ins/jigsaw
+%{_libdir}/gimp/%{api_version}/plug-ins/lighting
+%{_libdir}/gimp/%{api_version}/plug-ins/mail
+%{_libdir}/gimp/%{api_version}/plug-ins/map-object
+%{_libdir}/gimp/%{api_version}/plug-ins/metadata-editor
+%{_libdir}/gimp/%{api_version}/plug-ins/metadata-viewer
+%{_libdir}/gimp/%{api_version}/plug-ins/nl-filter
+%{_libdir}/gimp/%{api_version}/plug-ins/pagecurl
+%{_libdir}/gimp/%{api_version}/plug-ins/plugin-browser
+%{_libdir}/gimp/%{api_version}/plug-ins/print
+%{_libdir}/gimp/%{api_version}/plug-ins/procedure-browser
+%{_libdir}/gimp/%{api_version}/plug-ins/qbist
+%{_libdir}/gimp/%{api_version}/plug-ins/sample-colorize
+%{_libdir}/gimp/%{api_version}/plug-ins/screenshot
+%{_libdir}/gimp/%{api_version}/plug-ins/script-fu
+%{_libdir}/gimp/%{api_version}/plug-ins/script-fu-server
+%{_libdir}/gimp/%{api_version}/plug-ins/selection-to-path
+%{_libdir}/gimp/%{api_version}/plug-ins/smooth-palette
+%{_libdir}/gimp/%{api_version}/plug-ins/sparkle
+%{_libdir}/gimp/%{api_version}/plug-ins/sphere-designer
+%{_libdir}/gimp/%{api_version}/plug-ins/test-sphere-v3
+%{_libdir}/gimp/%{api_version}/plug-ins/tile
+%{_libdir}/gimp/%{api_version}/plug-ins/tile-small
+%{_libdir}/gimp/%{api_version}/plug-ins/unit-editor
+%{_libdir}/gimp/%{api_version}/plug-ins/van-gogh-lic
+%{_libdir}/gimp/%{api_version}/plug-ins/warp
+%{_libdir}/gimp/%{api_version}/plug-ins/wavelet-decompose
+%{_libdir}/gimp/%{api_version}/plug-ins/web-browser
+%{_mandir}/man1/gimp.1*
+%{_mandir}/man1/gimp-%{major}.1*
+%{_mandir}/man1/gimp-%{api_version}.1*
+%{_mandir}/man1/gimp-console.1*
+%{_mandir}/man1/gimp-console-%{major}.1*
+%{_mandir}/man1/gimp-console-%{api_version}.1*
+%{_mandir}/man5/gimprc.5*
+%{_mandir}/man5/gimprc-%{major}.5*
+%{_mandir}/man5/gimprc-%{api_version}.5*
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/%{api_version}
+%config %{_sysconfdir}/%{name}/%{api_version}/controllerrc
+%config %{_sysconfdir}/%{name}/%{api_version}/gimp.css
+%config %{_sysconfdir}/%{name}/%{api_version}/gimprc
+%config %{_sysconfdir}/%{name}/%{api_version}/sessionrc
+%config %{_sysconfdir}/%{name}/%{api_version}/templaterc
+%config %{_sysconfdir}/%{name}/%{api_version}/toolrc
+%config %{_sysconfdir}/%{name}/%{api_version}/unitrc

 %files plugin-aa
-%{_libdir}/gimp/2.99/plug-ins/file-aa
+%{_libdir}/gimp/%{api_version}/plug-ins/file-aa

-%files -n libgimp-3_0-0
+%files libs -f gimp%{gettext_version}-libgimp.lang
 %dir %{_datadir}/gimp
-%dir %{_datadir}/gimp/2.99
+%dir %{_datadir}/gimp/%{api_version}
 %dir %{_libdir}/gimp
-%dir %{_libdir}/gimp/2.99
-%dir %{_libdir}/gimp/2.99/environ
-%dir %{_libdir}/gimp/2.99/interpreters
-%dir %{_libdir}/gimp/2.99/modules
-%dir %{_libdir}/gimp/2.99/plug-ins
-%dir %{_libdir}/gimp/2.99/extensions
-%{_libdir}/libgimp-3.0.so.*
-%{_libdir}/libgimpbase-3.0.so.*
-%{_libdir}/libgimpcolor-3.0.so.*
-%{_libdir}/libgimpconfig-3.0.so.*
-%{_libdir}/libgimpmath-3.0.so.*
-%{_libdir}/libgimpmodule-3.0.so.*
+%dir %{_libdir}/gimp/%{api_version}
+%dir %{_libdir}/gimp/%{api_version}/environ
+%dir %{_libdir}/gimp/%{api_version}/interpreters
+%dir %{_libdir}/gimp/%{api_version}/modules
+%dir %{_libdir}/gimp/%{api_version}/plug-ins
+%dir %{_libdir}/gimp/%{api_version}/extensions
+%{_libdir}/libgimp*-%{api_version}.so.*
+%{_libdir}/girepository-1.0/Gimp-%{api_version}.typelib
+%{_libdir}/girepository-1.0/GimpUi-%{api_version}.typelib

-%files -n libgimpui-3_0-0
-%{_libdir}/libgimpthumb-3.0.so.*
-%{_libdir}/libgimpui-3.0.so.*
-%{_libdir}/libgimpwidgets-3.0.so.*
-
-%files plugin-python3 -f plugins-python.list
-%{_libdir}/gimp/2.99/environ/python.env
-%{_libdir}/gimp/2.99/interpreters/pygimp.interp
-%{_libdir}/girepository-1.0/Gimp-3.0.typelib
-%{_libdir}/girepository-1.0/GimpUi-3.0.typelib
+%files plugin-python3 -f gimp%{gettext_version}-python.lang
+%{_libdir}/gimp/%{api_version}/environ/python.env
+%{_libdir}/gimp/%{api_version}/plug-ins/colorxhtml
+%{_libdir}/gimp/%{api_version}/plug-ins/file-openraster
+%{_libdir}/gimp/%{api_version}/plug-ins/foggify
+%{_libdir}/gimp/%{api_version}/plug-ins/gradients-save-as-css
+%{_libdir}/gimp/%{api_version}/plug-ins/histogram-export
+%{_libdir}/gimp/%{api_version}/plug-ins/palette-offset
+%{_libdir}/gimp/%{api_version}/plug-ins/palette-sort
+%{_libdir}/gimp/%{api_version}/plug-ins/palette-to-gradient
+%{_libdir}/gimp/%{api_version}/plug-ins/python-console
+%{_libdir}/gimp/%{api_version}/plug-ins/python-eval
+%{_libdir}/gimp/%{api_version}/plug-ins/spyro-plus

 %files vala
-%{_datadir}/vala/vapi/gimp-3.0.deps
-%{_datadir}/vala/vapi/gimp-3.0.vapi
-%{_datadir}/vala/vapi/gimp-ui-3.0.deps
-%{_datadir}/vala/vapi/gimp-ui-3.0.vapi
+%{_datadir}/vala/vapi/gimp-%{api_version}.deps
+%{_datadir}/vala/vapi/gimp-%{api_version}.vapi
+%{_datadir}/vala/vapi/gimp-ui-%{api_version}.deps
+%{_datadir}/vala/vapi/gimp-ui-%{api_version}.vapi

 %files devel
 %doc README.i18n
-%{_bindir}/gimptool-2.99
-%{_includedir}/gimp-3.0/
+%{_bindir}/gimptool
+%{_bindir}/gimptool-%{major}
+%{_bindir}/gimptool-%{api_version}
+%{_includedir}/gimp-%{api_version}
 %{_libdir}/*.so
-%{_datadir}/aclocal/gimp-3.0.m4
-%{_libdir}/pkgconfig/gimp-3.0.pc
-%{_libdir}/pkgconfig/gimpthumb-3.0.pc
-%{_libdir}/pkgconfig/gimpui-3.0.pc
-%dir %{_datadir}/locale
-%{_datadir}/locale/*/LC_MESSAGES/*
-%config %{_sysconfdir}/rpm/macros.gimp
-%{_datadir}/gir-1.0/Gimp-3.0.gir
-%{_datadir}/gir-1.0/GimpUi-3.0.gir
+%{_libdir}/pkgconfig/*.pc
+%{_rpmmacrodir}/macros.gimp
+%{_datadir}/gir-1.0/Gimp-%{api_version}.gir
+%{_datadir}/gir-1.0/GimpUi-%{api_version}.gir
+%{_mandir}/man1/gimptool*
+%doc %{_datadir}/doc/%{name}-%{api_version}

-%files extension-goat-excercises
-%{_libdir}/gimp/2.99/extensions/org.gimp.extension.goat-exercises
+%files extension-goat-excercises -f org.gimp.extension.goat-exercises.lang
+%dir %{_libdir}/gimp/%{api_version}/extensions/org.gimp.extension.goat-exercises
+%{_libdir}/gimp/%{api_version}/extensions/org.gimp.extension.goat-exercises/goat-exercise*
+%{_libdir}/gimp/%{api_version}/extensions/org.gimp.extension.goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml
+%dir %{_libdir}/gimp/%{api_version}/extensions/org.gimp.extension.goat-exercises/locale

 %changelog
+* Tue May 06 2025 Funda Wang <fundawang@yeah.net> - 2:3.0.2-1
+- 3.0.2
+
 * Tue May 06 2025 wangkai <13474090681@163.com> - 2:2.99.10-3
 - Fix CVE-2025-2761

--- a/gimp.yaml
+++ b/gimp.yaml
@ -1,4 +1,4 @@
 version_control: gitlab.gnome
-src_repo: GIMP
-tag_prefix: GIMP_
-seperator: _
+src_repo: gimp
+tag_prefix: ^GIMP_
+separator: _
--- a/git_info_from_dirname.patch
+++ b/git_info_from_dirname.patch
@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 5321a0c7d5..e6b16a66e6 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -141,16 +141,10 @@ CLEANFILES = $(generated_sources)
- # already exists because then we are probably working with a tarball
- # in which case the git-version.h we ship is correct.
- git-version.h: update-git-version-header
-	@if test -e "$(top_srcdir)/.git"; then \
-	  git_version="`git --git-dir=$(top_srcdir)/.git describe --always`"; \
-	  git_version_abbrev="`git --git-dir=$(top_srcdir)/.git rev-parse --short HEAD`"; \
-	  git_last_commit_year="`git --git-dir=$(top_srcdir)/.git log -n1 --reverse --pretty=%ci | cut -b 1-4`"; \
-	elif test ! -f "$@"; then \
-	  git_version="Unknown, shouldn't happen"; \
-	  git_version_abbrev="$$git_version"; \
-	  git_last_commit_timestamp=-1; \
-	  git_last_commit_year="`date -u '+%Y'`"; \
-	fi; \
-+	git_version="`basename \`pwd\`` (OBS AppImage)"; \
-+	git_version_abbrev="`basename \`pwd\` | sed 's,gimp-\(.*\)+git\(.*\)\.\(.*\),\3,g'`"; \
-+	git_last_commit_year="`date -u '+%Y'`"; \
-+	git_last_commit_timestamp=-1; \
- 	if test -n "$$git_version"; then \
- 	  echo "#ifndef __GIT_VERSION_H__" > "$@.tmp"; \
- 	  echo "#define __GIT_VERSION_H__" >> "$@.tmp"; \
--- a/macros.gimp
+++ b/macros.gimp
@ -1,5 +0,0 @@
-#
-# Interface versions exposed by GIMP:
-#
-%gimp_api_version @GIMP_APIVER@
-%gimp_abi_version @GIMP_ABIVER@