The package rpms/gimp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gimp.git/commit/?id=6dc3d5152fb1856e....
Change: -%ifnarch %plain_lua_arches
Thanks.
Full change: ============
commit 6dc3d5152fb1856e8f2bd14c175f9ec0a59391af Author: Nils Philippsen nils@tiptoe.de Date: Wed Aug 21 00:20:25 2024 +0200
Revert updating to 2.99.19^... 🫣
[skip changelog, bump release: 11]
Signed-off-by: Nils Philippsen nils@tiptoe.de
diff --git a/.gitignore b/.gitignore index 04042b2..4a4520b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,3 @@ gimp-2.6.10-1-autoreconf.patch.bz2 /gimp-2.10.34.tar.bz2 /gimp-2.10.36.tar.bz2 /gimp-2.10.38.tar.bz2 -/gimp-2.99.19-git256e0ca5a0.tar.xz -/gimp-2.99.19-gitd38362c9a0.tar.xz -/gimp-splash.png -/gimp-2.99.19-git5814d9ed30.tar.xz diff --git a/0001-Don-t-require-unreleased-gegl-version.patch b/0001-Don-t-require-unreleased-gegl-version.patch deleted file mode 100644 index fa3dd4b..0000000 --- a/0001-Don-t-require-unreleased-gegl-version.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 54231e7d405bfd674f75f2d87ff5ce3ad025b45c Mon Sep 17 00:00:00 2001 -From: Nils Philippsen nils@tiptoe.de -Date: Wed, 14 Aug 2024 13:44:21 +0200 -Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20require=20unreleased=20gegl=20v?= - =?UTF-8?q?ersion?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c28fa121480d2ea34139c9cc794add4236e99eb7. - -Signed-off-by: Nils Philippsen nils@tiptoe.de ---- - app/tools/gimpoperationtool.c | 25 ++++++++----------------- - 1 file changed, 8 insertions(+), 17 deletions(-) - -diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c -index 82f6096b55..f427ee9019 100644 ---- a/app/tools/gimpoperationtool.c -+++ b/app/tools/gimpoperationtool.c -@@ -103,8 +103,7 @@ static void gimp_operation_tool_add_gui (GimpOperationTool *tool) - static AuxInput * gimp_operation_tool_aux_input_new (GimpOperationTool *tool, - GeglNode *operation, - const gchar *input_pad, -- const gchar *label, -- const gchar *description); -+ const gchar *label); - static void gimp_operation_tool_aux_input_detach(AuxInput *input); - static void gimp_operation_tool_aux_input_clear (AuxInput *input); - static void gimp_operation_tool_aux_input_free (AuxInput *input); -@@ -550,20 +549,15 @@ gimp_operation_tool_create_gui (GimpOperationTool *op_tool) - - g_return_if_fail (regex != NULL); - -- label = g_strdup (gegl_node_get_pad_label (filter_tool->operation, input_pads[i])); -- -- if (label == NULL) -- label = g_regex_replace (regex, -- input_pads[i], -1, 0, -- /* Translators: don't translate "Aux" */ -- _("Aux\1 Input"), -- 0, NULL); -+ /* Translators: don't translate "Aux" */ -+ label = g_regex_replace (regex, -+ input_pads[i], -1, 0, -+ _("Aux\1 Input"), -+ 0, NULL); - - input = gimp_operation_tool_aux_input_new (op_tool, - filter_tool->operation, -- input_pads[i], label, -- gegl_node_get_pad_description (filter_tool->operation, -- input_pads[i])); -+ input_pads[i], label); - - op_tool->aux_inputs = g_list_prepend (op_tool->aux_inputs, input); - -@@ -663,8 +657,7 @@ static AuxInput * - gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, - GeglNode *operation, - const gchar *input_pad, -- const gchar *label, -- const gchar *description) -+ const gchar *label) - { - AuxInput *input = g_slice_new (AuxInput); - GimpContext *context; -@@ -681,8 +674,6 @@ gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, - context = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (op_tool)); - - input->box = gimp_buffer_source_box_new (context, input->node, label); -- if (description) -- gtk_widget_set_tooltip_text (input->box, description); - - /* make AuxInput owner of the box */ - g_object_ref_sink (input->box); --- -2.46.0 - diff --git a/0001-libgimp-Use-namespaced-doc-reference.patch b/0001-libgimp-Use-namespaced-doc-reference.patch deleted file mode 100644 index 810ba8a..0000000 --- a/0001-libgimp-Use-namespaced-doc-reference.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c7e1b11bed0d001323471e774564f065bcfd62f6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen nils@tiptoe.de -Date: Mon, 19 Aug 2024 16:16:31 +0200 -Subject: [PATCH] libgimp: Use namespaced doc reference - -Otherwise, building the devel docs errors out like this: - -``` -FAILED: devel-docs/reference/gimp/libgimp-3.0 -... -WARNING: Unknown namespace ExportReturn -[enum@ExportReturn.EXPORT]. -^~~~~~~~~~~~~~~~~~~~~~~~~~ -``` - -Signed-off-by: Nils Philippsen nils@tiptoe.de ---- - libgimp/gimpexportoptions.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libgimp/gimpexportoptions.c b/libgimp/gimpexportoptions.c -index 22fca36c2d..5ffae2a1b1 100644 ---- a/libgimp/gimpexportoptions.c -+++ b/libgimp/gimpexportoptions.c -@@ -537,17 +537,17 @@ export_action_perform (const ExportAction *action, - * - * If necessary, a copy is created, converted and modified, @image - * changed to point to the new image and the procedure returns -- * [enum@ExportReturn.EXPORT]. -+ * [enum@Gimp.ExportReturn.EXPORT]. - * In this case, you must take care of deleting the created image using - * [method@Image.delete] once the image has been exported, unless you - * were planning to display it with [ctor@Display.new], or you will leak - * memory. - * -- * If [enum@ExportReturn.IGNORE] is returned, then @image is still the -+ * If [enum@Gimp.ExportReturn.IGNORE] is returned, then @image is still the - * original image. You should neither modify it, nor should you delete - * it in the end. If you wish to temporarily modify the image before - * export anyway, call [method@Image.duplicate] when -- * [enum@ExportReturn.IGNORE] was returned. -+ * [enum@Gimp.ExportReturn.IGNORE] was returned. - * - * Returns: An enum of #GimpExportReturn. - * --- -2.46.0 - diff --git a/README.md b/README.md deleted file mode 100644 index 93230c2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# gimp - -The gimp package diff --git a/changelog b/changelog index 3c7b619..3f442ad 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,82 @@ +* Thu Jul 18 2024 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.38-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 12 2024 Nils Philippsen nils@tiptoe.de - 2:2.10.38-2 +- Use SPDX license identifiers consistently + +* Sun May 05 2024 Nils Philippsen nils@tiptoe.de - 2:2.10.38-1 +- Update to version 2.10.38 + +* Thu May 02 2024 Nils Philippsen nils@tiptoe.de - 2:2.10.36-9 +- Explicitly depend on pygtk2 again + +* Wed Apr 24 2024 Benjamin A. Beasley code@musicinmybrain.net - 2:2.10.36-8 +- Rebuilt for openexr 3.2.4 + +* Wed Mar 13 2024 Sérgio M. Basto sergio@serjux.com - 2:2.10.36-7 +- Rebuild for jpegxl (libjxl) 0.10.2 + +* Wed Feb 14 2024 Sérgio M. Basto sergio@serjux.com - 2:2.10.36-6 +- Rebuild for jpegxl (libjxl) 0.9.2 with soname bump + +* Tue Feb 13 2024 Sérgio M. Basto sergio@serjux.com - 2:2.10.36-5 +- Disabling "type safety check" fix build on Rawhide + +* Wed Jan 24 2024 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.36-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.36-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Nov 11 2023 Nils Philippsen nils@tiptoe.de - 2:2.10.36-1 +- Update to version 2.10.36 + +* Sun Aug 20 2023 Nils Philippsen nils@tiptoe.de - 2:2.10.34-8 +- Fix loading HEVC-encoded HEIF images (#2189462) + +* Wed Jul 19 2023 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.34-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Josef Řídký jridky@redhat.com - 2:2.10.34-6 +- Fix License and Patch usage + +* Sun Jun 18 2023 Sérgio M. Basto sergio@serjux.com - 2:2.10.34-5 +- Mass rebuild for jpegxl-0.8.1 + +* Tue May 09 2023 Josef Řídký jridky@redhat.com - 2:2.10.34-4 +- Update SPDX license tags + +* Tue May 02 2023 Josef Řídký jridky@redhat.com - 2:2.10.34-3 +- Fix SPDX license format + +* Tue May 02 2023 Josef Řídký jridky@redhat.com - 2:2.10.34-2 +- Move to SPDX license format + +* Fri Apr 14 2023 Josef Řídký jridky@redhat.com - 2:2.10.34-1 +- Rebased to the latest upstream release 2.10.34 (bz#2172284) +- Add support for HEIF format (bz#2186478) + +* Tue Jan 24 2023 Zdenek Dohnal zdohnal@redhat.com - 2:2.10.32-7 +- Rebuild for ghostscript 10.0.0 + +* Thu Jan 19 2023 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.32-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 13 2023 Florian Weimer fweimer@redhat.com - 2:2.10.32-5 +- Port configure script to C99 + +* Sat Sep 03 2022 Nils Philippsen nils@tiptoe.de - 2:2.10.32-4 +- Remove auto-discovered files from %%files + +* Sat Sep 03 2022 Nils Philippsen nils@tiptoe.de - 2:2.10.32-3 +- Add and update (build-)dependencies + +* Sat Sep 03 2022 Nils Philippsen nils@tiptoe.de - 2:2.10.32-2 +- Remove more cruft for unstable version packaging + +* Sat Sep 03 2022 Nils Philippsen nils@tiptoe.de - 2:2.10.32-1 +- Version 2.10.32 + * Thu Jul 21 2022 Fedora Release Engineering releng@fedoraproject.org - 2:2.10.30-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/gimp-2.99.19-cm-system-monitor-profile-by-default.patch b/gimp-2.10.0-cm-system-monitor-profile-by-default.patch similarity index 54% rename from gimp-2.99.19-cm-system-monitor-profile-by-default.patch rename to gimp-2.10.0-cm-system-monitor-profile-by-default.patch index 0e036f8..96a875d 100644 --- a/gimp-2.99.19-cm-system-monitor-profile-by-default.patch +++ b/gimp-2.10.0-cm-system-monitor-profile-by-default.patch @@ -1,7 +1,8 @@ -diff -up gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default 2024-02-17 18:01:20.000000000 +0100 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:39:06.468575598 +0200 -@@ -316,9 +316,9 @@ +diff --git a/etc/gimprc.in b/etc/gimprc.in +index bdf8f0c..e6757e8 100644 +--- a/etc/gimprc.in ++++ b/etc/gimprc.in +@@ -317,9 +317,9 @@
# Defines the color management behavior. This is a parameter list. # @@ -13,12 +14,14 @@ diff -up gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2. # (display-rendering-intent relative-colorimetric) # (display-use-black-point-compensation yes) # (display-optimize yes) -@@ -326,7 +326,8 @@ - # (simulation-use-black-point-compensation no) +@@ -328,9 +328,8 @@ # (simulation-optimize yes) # (simulation-gamut-check no) --# (out-of-gamut-color (color-rgb 1 0 1))) -+# (out-of-gamut-color (color-rgb 1 0 1)) + # (out-of-gamut-color (color-rgb 1 0 1)) +-# (show-rgb-u8 no) +-# (show-hsv no) +-# (display-module "CdisplayLcms")) ++# (display-module "CdisplayLcms") +)
# Keep a permanent record of all opened and saved files in the Recent diff --git a/gimp-2.10.12-default-font.patch b/gimp-2.10.12-default-font.patch new file mode 100644 index 0000000..301e4a6 --- /dev/null +++ b/gimp-2.10.12-default-font.patch @@ -0,0 +1,12 @@ +diff -urNp a/etc/gimprc.in b/etc/gimprc.in +--- a/etc/gimprc.in 2019-08-20 13:03:43.195089141 +0200 ++++ b/etc/gimprc.in 2019-08-20 13:04:09.109353485 +0200 +@@ -153,7 +153,7 @@ + # Where to look for fonts in addition to the system-wide installed fonts. + # This is a colon-separated list of folders to search. + # +-# (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts") ++(font-path "${gimp_dir}/fonts") + + # Specify a default brush. The brush is searched for in the specified brush + # path. This is a string value. diff --git a/gimp-2.10.18-no-phone-home-default.patch b/gimp-2.10.18-no-phone-home-default.patch new file mode 100644 index 0000000..2054b4a --- /dev/null +++ b/gimp-2.10.18-no-phone-home-default.patch @@ -0,0 +1,12 @@ +diff -up gimp-2.10.18/etc/gimprc.in.no-phone-home-default gimp-2.10.18/etc/gimprc.in +--- gimp-2.10.18/etc/gimprc.in.no-phone-home-default 2020-02-23 21:15:47.217777581 +0100 ++++ gimp-2.10.18/etc/gimprc.in 2020-02-23 21:22:42.416162110 +0100 +@@ -393,7 +393,7 @@ + # Check for availability of GIMP updates through background internet queries. + # Possible values are yes and no. + # +-# (check-updates yes) ++(check-updates no) + + # Timestamp of the last update check. (null) + # diff --git a/gimp-2.10.24-external-help-browser.patch b/gimp-2.10.24-external-help-browser.patch new file mode 100644 index 0000000..09f4118 --- /dev/null +++ b/gimp-2.10.24-external-help-browser.patch @@ -0,0 +1,12 @@ +diff -up gimp-2.10.24/etc/gimprc.in.external-help-browser gimp-2.10.24/etc/gimprc.in +--- gimp-2.10.24/etc/gimprc.in.external-help-browser 2021-04-03 00:02:39.312656132 +0200 ++++ gimp-2.10.24/etc/gimprc.in 2021-04-03 00:03:27.360453285 +0200 +@@ -836,7 +836,7 @@ + # Sets the browser used by the help system. Possible values are gimp and + # web-browser. + # +-# (help-browser web-browser) ++(help-browser web-browser) + + # When enabled, a search of actions will also return inactive actions. + # Possible values are yes and no. diff --git a/gimp-2.99.19-external-help-browser.patch b/gimp-2.99.19-external-help-browser.patch deleted file mode 100644 index 44e3aab..0000000 --- a/gimp-2.99.19-external-help-browser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.99.18/etc/gimprc.in.external-help-browser gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.external-help-browser 2024-05-07 14:41:40.660506520 +0200 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:46:04.028680986 +0200 -@@ -828,7 +828,7 @@ - # Sets the browser used by the help system. Possible values are gimp and - # web-browser. - # --# (help-browser gimp) -+(help-browser web-browser) - - # The maximum number of actions saved in history. This is an integer value. - # diff --git a/gimp-2.99.19-no-phone-home-default.patch b/gimp-2.99.19-no-phone-home-default.patch deleted file mode 100644 index a537498..0000000 --- a/gimp-2.99.19-no-phone-home-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.99.18/etc/gimprc.in.no-phone-home-default gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.no-phone-home-default 2024-05-07 14:40:02.746185394 +0200 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:40:49.353862228 +0200 -@@ -399,7 +399,7 @@ - # Check for availability of GIMP updates through background internet queries. - # Possible values are yes and no. - # --# (check-updates yes) -+(check-updates no) - - # Timestamp of the last update check. This is an integer value. - # diff --git a/gimp-configure-c99.patch b/gimp-configure-c99.patch new file mode 100644 index 0000000..d9ed54b --- /dev/null +++ b/gimp-configure-c99.patch @@ -0,0 +1,56 @@ +Do not call the undeclared exit function. Implicit function +declarations are likely not going to be supported by future compilers +by default, changing the outcome of this configure probe. + +Submitted upstream: https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/810 + +diff --git a/configure b/configure +index 6e62da8e3c164f82..f1c447baf7ff68f7 100755 +--- a/configure ++++ b/configure +@@ -28898,17 +28898,17 @@ else $as_nop + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); + if (id == -1) +- exit (2); ++ return 2; + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); +- exit (1); ++ return 1; + } + shmdt (shmaddr); + shmdt (shmaddr); +- exit (0); ++ return 0; + } + + _ACEOF +diff --git a/configure.ac b/configure.ac +index d73f56228712f59d..32d2a072863ae64f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1284,17 +1284,17 @@ elif test "x$shmtype" = "xsysv"; then + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); + if (id == -1) +- exit (2); ++ return 2; + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); +- exit (1); ++ return 1; + } + shmdt (shmaddr); + shmdt (shmaddr); +- exit (0); ++ return 0; + } + ]])], + [AC_DEFINE([IPC_RMID_DEFERRED_RELEASE],[1], diff --git a/gimp-splash.sha256sum b/gimp-splash.sha256sum deleted file mode 100644 index 2d3910d..0000000 --- a/gimp-splash.sha256sum +++ /dev/null @@ -1 +0,0 @@ -90ac7f576388aeee0cff4c8f3c05a6b2ee89ffc1f82bd42208db9a5fadc138d3 gimp-data/images/gimp-splash.xcf.xz diff --git a/gimp.spec b/gimp.spec index 3f289b1..f126c37 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,171 +1,92 @@ #### options: # Use the following --with/--without <option> switches to control how the # package will be built: - -# is_default_version: This is the default GIMP version in a Fedora release -# label_overlay: Put version label in app icons -%if ! 0%{?fedora} || 0%{?fedora} >= 42 -%bcond is_default_version 1 -%bcond label_overlay 0 -%else -%bcond is_default_version 0 -%bcond label_overlay 1 -%endif - +# +# default_binary: install unversioned binary +%bcond_without default_binary # libunwind support (only available on some architectures) -%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 40 || 0%{?rhel} >= 11 -%global unwind_arches %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 riscv64 +%ifarch %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 +%bcond_without libunwind %else -%global unwind_arches %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 +%bcond_with libunwind %endif
-%ifarch %unwind_arches -%bcond libunwind 1 -%else -%bcond libunwind 0 -%endif +%global build_type_safety_c 0
-%ifnarch s390x -%bcond tests 1 -%bcond prebuilt_splash 0 -%else -# Tests hang on s390x, skip them. -%bcond tests 0 -%bcond prebuilt_splash 1 -%endif - -# When building in Koji or mock, networking isn’t available. -%bcond skip_networking_tests 1 -# Some tests fail under normal user environments, don’t skip them by default. -%bcond skip_user_tests 0 - -# The lists of tests to skip should not have leading or trailing white space, -# this breaks the logic in %%check. - -# tests known to fail if networking isn’t available -%global skip_tests_networking gimp:desktop / appdata_file - -# tests known to fail in a normal user environment -%global skip_tests_user gimp:app / save-and-export\ -gimp:app / single-window-mode\ -gimp:app / ui - -# luajit isn’t available on all arches -%global plain_lua_arches riscv64 ppc64 ppc64le - -%global prerelease 1 +# skip tests known to be problematic in a specific version +#global skip_checks_version X.Y.Z +#global skip_checks test1 test2 test3
Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 -Version: 2.99.19^20240819git5814d9ed30 +Version: 2.10.38 Release: %autorelease
# Compute some version related macros. - -# In the case of a snapshot version (e.g. "Version: 2.99.19^20240814git256e0ca5a0"), this computes -# the "plain" version (as defined in upstream sources), %%snapshot and %%git_rev macros. In the case -# of a normal release, %%plain_version will be the same as %%version. -%global plain_version %{lua: - local plain_version = (string.gsub(macros.version, '^(.*)[%^~].*$', '%1')) - print(plain_version) - if plain_version ~= macros.version then - macros.snapshot = (string.gsub(macros.version, '^.*[%^~](.*)$', '%1')) - macros.git_rev = (string.gsub(macros.snapshot, '^.*git(.*)$', '%1')) - end -} -%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} +# Ugly, need to get quoting percent signs straight. +%global major %(ver=%{version}; echo ${ver%%%%.*}) +%global minor %(ver=%{version}; ver=${ver#%major.}; echo ${ver%%%%.*}) +%global micro %(ver=%{version}; ver=${ver#%major.%minor.}; echo ${ver%%%%.*}) +%global binver 2.10 %global interface_age 0 -%if %prerelease -%global gettext_version 30 -%global api_version 3.0 -%global lib_api_version 3.0 -%else %global gettext_version %{major}0 -%global api_version %{major}.0 %global lib_api_version %{major}.0 -%endif -%global lib_minor %{lua: print(tonumber(macros.minor) * 100)} +%global lib_minor %(echo $[%minor * 100]) %global lib_micro %micro
# gimp core app is GPL-3.0-or-later, libgimp and other libraries are LGPL-3.0-or-later -# plugin file-dds is GPL-2.0-or-later and plugins script-fu/libscriptfu/{ftx,tinyscheme} -# are BSD-3-Clause, icon themes are CC-BY-SA-{3.0,4.0}, data files such as brushes and -# patterns are CC0 -License: LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND CC0 -URL: https://www.gimp.org -%if %{with label_overlay} -BuildRequires: ImageMagick -%endif +# plugin file-dds is GPL-2.0-or-later and plugins script-fu/{ftx,tinyscheme} are BSD-3-Clause +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: appdata-tools -BuildRequires: appstream -BuildRequires: coreutils -BuildRequires: dbus-daemon -BuildRequires: desktop-file-utils +BuildRequires: chrpath >= 0.13-5 BuildRequires: gcc BuildRequires: gegl04-tools -BuildRequires: gettext >= 0.19.8 -BuildRequires: gi-docgen -BuildRequires: gjs +BuildRequires: gettext >= 0.19 BuildRequires: glib-networking +BuildRequires: gtk-doc >= 1.0 +BuildRequires: intltool >= 0.40.1 BuildRequires: libgs-devel -BuildRequires: libxml2 -BuildRequires: libxslt -%ifnarch %plain_lua_arches -BuildRequires: lua-lgi-compat -BuildRequires: luajit -%else -BuildRequires: lua >= 5.4 -BuildRequires: lua-lgi -%endif -BuildRequires: meson +BuildRequires: make BuildRequires: perl >= 5.10.0 BuildRequires: pkgconfig(alsa) >= 1.0.0 -BuildRequires: pkgconfig(appstream-glib) >= 0.7.7 -BuildRequires: pkgconfig(atk) >= 2.4.0 -BuildRequires: pkgconfig(babl-0.1) >= 0.1.108 +BuildRequires: pkgconfig(atk) >= 2.2.0 +%if ! 0%{?fedora} || 0%{?fedora} >= 39 +BuildRequires: pkgconfig(babl-0.1) >= 0.1.74 +%else +BuildRequires: pkgconfig(babl) >= 0.1.74 +%endif BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(cairo) >= 1.14.0 -BuildRequires: pkgconfig(cairo-pdf) >= 1.12.2 -BuildRequires: pkgconfig(cfitsio) +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.48 -BuildRequires: pkgconfig(gexiv2) >= 0.14.0 -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.70.0 -BuildRequires: pkgconfig(gmodule-no-export-2.0) -BuildRequires: pkgconfig(gobject-2.0) >= 2.70.0 -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 +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) >= 2.8.2 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.19 BuildRequires: pkgconfig(iso-codes) -BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6 +BuildRequires: pkgconfig(jasper) BuildRequires: pkgconfig(lcms2) >= 2.8 -BuildRequires: pkgconfig(libheif) >= 1.15.1 +BuildRequires: pkgconfig(libheif) BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libjxl) >= 0.7.0 -BuildRequires: pkgconfig(libjxl_threads) >= 0.7.0 +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) >= 4.0.0 +BuildRequires: pkgconfig(libtiff-4) %if %{with libunwind} BuildRequires: pkgconfig(libunwind) >= 1.1.0 %endif @@ -174,71 +95,47 @@ 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) >= 1.6.1 -BuildRequires: pkgconfig(pango) >= 1.50.0 -BuildRequires: pkgconfig(pangocairo) >= 1.50.0 -BuildRequires: pkgconfig(pangoft2) >= 1.50.0 -BuildRequires: pkgconfig(poppler-data) >= 0.4.9 -BuildRequires: pkgconfig(poppler-glib) >= 0.69.0 -BuildRequires: pkgconfig(python3) >= 3.6.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(xfixes) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(zlib) -BuildRequires: python3dist(pygobject) >= 3.0 -BuildRequires: vala -BuildRequires: xorg-x11-server-Xvfb
-Requires: gjs Requires: hicolor-icon-theme -%ifnarch %plain_lua_arches -Requires: lua-lgi-compat -Requires: luajit -%else -Requires: lua >= 5.4 -Requires: lua-lgi -%endif +Recommends: mypaint-brushes Requires: xdg-utils Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: python3dist(pygobject) >= 3.0 +Requires: pygtk2%{?_isa} >= 2.10.4 +Obsoletes: %{name}-help-browser < %{epoch}:%{version}-%{release} +Conflicts: %{name}-help-browser < %{epoch}:%{version}-%{release}
-Recommends: mypaint-brushes - -Obsoletes: gimp3 < 3.0 -Conflicts: gimp3 < 3.0 +#Remove dependency on RPM Fusion repository +Obsoletes: gimp-heif-plugin < 1.1.0-13
-%if ! %defined snapshot -Source0: https://download.gimp.org/pub/gimp/v%%7Bbin_version%7D/gimp-%%7Bversion%7D.t... -%else -# Tarball built from git snapshot with `meson dist` and renamed accordingly -Source0: gimp-%{plain_version}-git%{git_rev}.tar.xz -%endif - -# Building this from source hangs on s390x 😢. Building on any other arch will convert -# gimp-data/images/gimp-splash.xcf.xz just fine. -Source1: gimp-splash.png -Source2: gimp-splash.sha256sum - -# Fedora specific patches: +Source0: https://download.gimp.org/pub/gimp/v%%7Bbinver%7D/gimp-%%7Bversion%7D.tar.bz...
# Try using the system monitor profile for color management by default. -Patch1: gimp-2.99.19-cm-system-monitor-profile-by-default.patch +# Fedora specific. +Patch1: gimp-2.10.0-cm-system-monitor-profile-by-default.patch + +# bz#1706653 +Patch2: gimp-2.10.12-default-font.patch
# don't phone home to check for updates by default -Patch2: gimp-2.99.19-no-phone-home-default.patch +Patch3: gimp-2.10.18-no-phone-home-default.patch
# use external help browser directly if help browser plug-in is not built -Patch3: gimp-2.99.19-external-help-browser.patch - -# Don’t require an unreleased gegl version -Patch4: 0001-Don-t-require-unreleased-gegl-version.patch - -# Submitted upstream: +Patch100: gimp-2.10.24-external-help-browser.patch
-# libgimp: Use namespaced doc reference -# https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/1789 -Patch5: 0001-libgimp-Use-namespaced-doc-reference.patch +Patch101: gimp-configure-c99.patch
%description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -252,8 +149,6 @@ with multi-level undo. %package libs Summary: GIMP libraries License: LGPL-3.0-or-later -Obsoletes: gimp3-libs < 3.0 -Conflicts: gimp3-libs < 3.0
%description libs The %{name}-libs package contains shared libraries needed for the GNU Image @@ -264,8 +159,6 @@ Summary: GIMP plugin and extension development kit License: LGPL-3.0-or-later Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel-tools = %{epoch}:%{version}-%{release} -Obsoletes: gimp3-devel < 3.0 -Conflicts: gimp3-devel < 3.0
%description devel The %{name}-devel package contains the files needed for writing GNU Image @@ -275,8 +168,6 @@ Manipulation Program (GIMP) plug-ins and extensions. Summary: GIMP plugin and extension development tools License: LGPL-3.0-or-later Requires: %{name}-devel = %{epoch}:%{version}-%{release} -Obsoletes: gimp3-devel-tools < 3.0 -Conflicts: gimp3-devel-tools < 3.0
%description devel-tools The %{name}-devel-tools package contains gimptool, a helper program to @@ -285,57 +176,54 @@ build GNU Image Manipulation Program (GIMP) plug-ins and extensions. %prep cat << EOF --- 8< --- Build options --------------------------------------------------- -is default version: %{with is_default_version} -label overlay: %{with label_overlay} -tests: %{with tests} -prebuilt splash: %{with prebuilt_splash} -%if %defined snapshot -snapshot: %{snapshot} -plain_version: %{plain_version} -git_rev: %{git_rev} -%endif +install default binary: %{with default_binary} --- >8 --------------------------------------------------------------------- EOF
-%setup -q -n gimp-%{plain_version} +%setup -q -n gimp-%{version}
%patch 1 -p1 -b .cm-system-monitor-profile-by-default -%patch 2 -p1 -b .no-phone-home-default -%patch 3 -p1 -b .external-help-browser -%patch 4 -p1 -b .don-t-require-unreleased-gegl-version -%patch 5 -p1 -b .namespace-docs-refs +%patch 2 -p1 -b .font-default +%patch 3 -p1 -b .no-phone-home-default + +%patch 100 -p1 -b .external-help-browser +%patch 101 -p1 -b .configure-c99
-# Verify the splash file source hasn’t changed -sha256sum -c %{SOURCE2} +# Avoid re-running autotools. +touch -r aclocal.m4 configure*
%build +# allow python2 package for RHEL-8 +export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 + # Use hardening compiler/linker flags because gimp is likely to deal with files # coming from untrusted sources %global _hardened_build 1 - -%meson \ -%if %{with is_default_version} - -Denable-default-bin=enabled \ +%configure \ + --enable-python \ + --enable-mp \ + --disable-static \ + --with-print \ + --enable-gimp-console \ + --with-aa \ + --with-gudev \ +%ifos linux + --with-linux-input \ +%endif + --without-webkit \ + --with-webp \ +%if %{with default_binary} + --enable-default-binary=yes \ %else - -Denable-default-bin=disabled \ + --enable-default-binary=no \ %endif - -Dilbm=disabled \ - -Dbug-report-url="https://bugzilla.redhat.com/" - -%if %{with prebuilt_splash} -# Building this from source hangs on s390x 😢, so prevent attempting to build it … -sed -i -e '/^subdir/!s/^/# /g' gimp-data/images/meson.build + --with-libmng --with-libxpm --with-alsa --with-cairo-pdf --with-libheif \ +%if 0%{?flatpak} + --with-icc-directory=/run/host/usr/share/color/icc/ \ %endif + --without-appdata-test
-%meson_build - -%install -%meson_install - -%if %{with prebuilt_splash} -# … instead, copy the prebuilt file into place. -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/gimp/%{api_version}/images/gimp-splash.png -%endif +%make_build
# Generate RPM macros from pkg-config data: # %%_gimp_datadir -- toplevel directory for brushes, gradients, scripts, ... @@ -345,7 +233,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/gimp/%{api_version}/images/gim # %%_gimp_scriptdir -- script-fu scripts directory # %%_gimp_plugindir -- plug-in directory gimp_pc_extract_normalize() { - PKG_CONFIG_PATH="%{buildroot}%{_libdir}/pkgconfig" \ + PKG_CONFIG_PATH="$PWD" \ pkg-config --variable="$1" gimp-%{lib_api_version} | \ sed \ -e 's|^%_mandir|%%{_mandir}|' \ @@ -381,23 +269,31 @@ cat << EOF > macros.gimp %%_gimp_plugindir ${_gimp_plugindir} EOF
+%install +%make_install install -D -m0644 macros.gimp %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp
-echo "%{__python3}=%{__python3}" >> %{buildroot}%{_libdir}/gimp/%{api_version}/interpreters/pygimp.interp +# remove rpaths +find %buildroot -type f -print0 | xargs -0 -L 20 chrpath --delete --keepgoing 2>/dev/null || : + +# remove .la files +find %buildroot -name *.la -exec %__rm -f {} ;
# # Plugins and modules change often (grab the executeable ones) # -find %{buildroot}%{_libdir}/gimp/%{api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '.a$' > gimp-plugin-files -find %{buildroot}%{_libdir}/gimp/%{api_version}/* -type d | sed "s@^%{buildroot}@%%dir @g" >> gimp-plugin-files - -grep '.py$' gimp-plugin-files | \ - sed 's+/[^/]*.py$+/__pycache__+g' | \ - sort -u > gimp-plugin-files-pycache - -cat gimp-plugin-files-pycache >> gimp-plugin-files +find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '.a$' > gimp-plugin-files +find %{buildroot}%{_libdir}/gimp/%{lib_api_version}/* -type d | sed "s@^%{buildroot}@%%dir @g" >> gimp-plugin-files + +# .pyc and .pyo files don't exist yet +grep ".py$" gimp-plugin-files > gimp-plugin-files-py +for file in $(cat gimp-plugin-files-py); do + for newfile in ${file}c ${file}o; do + grep -F -q -x "$newfile" gimp-plugin-files || echo "$newfile" + done +done >> gimp-plugin-files
-%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gimp/%{api_version} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/gimp/%{lib_api_version}
# # Auto detect the lang files. @@ -415,15 +311,15 @@ cat gimp%{gettext_version}.lang gimp%{gettext_version}-std-plug-ins.lang gimp%{g # cat gimp-plugin-files gimp-all.lang > gimp.files
-%if %{with is_default_version} +%if %{with default_binary} # install default binary symlinks -ln -snf gimp-%{bin_version} %{buildroot}%{_bindir}/gimp -ln -snf gimp-%{bin_version}.1 %{buildroot}%{_mandir}/man1/gimp.1 -ln -snf gimp-console-%{bin_version} %{buildroot}/%{_bindir}/gimp-console -ln -snf gimp-console-%{bin_version}.1 %{buildroot}/%{_mandir}/man1/gimp-console.1 -ln -snf gimptool-%{bin_version} %{buildroot}%{_bindir}/gimptool -ln -snf gimptool-%{bin_version}.1 %{buildroot}%{_mandir}/man1/gimptool.1 -ln -snf gimprc-%{bin_version}.5 %{buildroot}/%{_mandir}/man5/gimprc.5 +ln -snf gimp-%{binver} %{buildroot}%{_bindir}/gimp +ln -snf gimp-%{binver}.1 %{buildroot}%{_mandir}/man1/gimp.1 +ln -snf gimp-console-%{binver} %{buildroot}/%{_bindir}/gimp-console +ln -snf gimp-console-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-console.1 +ln -snf gimptool-%{lib_api_version} %{buildroot}%{_bindir}/gimptool +ln -snf gimptool-%{lib_api_version}.1 %{buildroot}%{_mandir}/man1/gimptool.1 +ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5 %endif
# Hardcode python interpreter in shipped python plug-ins. This actually has no @@ -431,132 +327,103 @@ ln -snf gimprc-%{bin_version}.5 %{buildroot}/%{_mandir}/man5/gimprc.5 # to the system python interpreter, but this will avoid false alarms. grep -E -rl '^#!\s*/usr/bin/env\s+python' --include=*.py "%{buildroot}" | while read file; do - sed -r '1s,^#!\s*/usr/bin/env\s+python$,#!%{__python3},' -i "$file" - sed -r '1s,^#!\s*/usr/bin/env\s+python3$,#!%{__python3},' -i "$file" + sed -r '1s,^#!\s*/usr/bin/env\s+python$,#!%{__python2},' -i "$file" + sed -r '1s,^#!\s*/usr/bin/env\s+python2$,#!%{__python2},' -i "$file" done
-rm -rf devel-docs/gimp-%{bin_version} -mv %{buildroot}%{_docdir}/gimp-%{bin_version} devel-docs -rm -r %{buildroot}%{_datadir}/gimp/%{api_version}/tests - -%if %{without is_default_version} -rm -rf %{buildroot}%{_datadir}/metainfo -%endif +echo "%{__python2}=%{__python2}" >> %{buildroot}%{_libdir}/gimp/%{lib_api_version}/interpreters/pygimp.interp
-%if %{with tests} %check -# Some tests in the gimp:app suite are known to fail when run in a normal desktop environment, but -# they work in isolated builds (mock, koji): save-and-export, single-window-mode, ui - -# skip tests known to fail -skip_tests="" - -%if %{with skip_networking_tests} -skip_tests="$skip_tests -%skip_tests_networking" -%endif - -%if %{with skip_user_tests} -skip_tests="$skip_tests -%skip_tests_user" -%endif - -all_tests="$(%meson_test --list 2>/dev/null)" -suites="$(echo "$all_tests" | while read suite ignore; do echo "${suite%+*}"; done | sort -u)" -for suite in $suites; do - suite_tests="$( - echo "$all_tests" | grep "^$suite /" | while read ignore ignore test; do - if ! echo "$skip_tests" | grep -qFx "$suite / $test"; then echo "$test"; fi - done - )" - if [ -n "$suite_tests" ]; then - %meson_test --suite "$suite" $suite_tests - fi +# skip tests known to be problematic in a specific version +%if "%{version}" == "%{?skip_checks_version}" +pushd app/tests +for problematic in %{?skip_checks}; do + rm -f "$problematic" + cat << EOF > "$problematic" +#!/bin/sh +echo Skipping test "$problematic" +EOF + chmod +x "$problematic" done +popd %endif +make check %{?_smp_mflags}
%ldconfig_scriptlets libs
%files -f gimp.files -%license LICENSE COPYING -%doc AUTHORS NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %doc docs/*.xcf* %{_datadir}/applications/*.desktop -%if %{with is_default_version} %{_datadir}/metainfo/*.appdata.xml -%endif +%{_datadir}/metainfo/*.metainfo.xml
%dir %{_datadir}/gimp -%dir %{_datadir}/gimp/%{api_version} -%{_datadir}/gimp/%{api_version}/dynamics/ -%{_datadir}/gimp/%{api_version}/file-raw/ -%{_datadir}/gimp/%{api_version}/menus/ -%{_datadir}/gimp/%{api_version}/tags/ -%{_datadir}/gimp/%{api_version}/tips/ -%{_datadir}/gimp/%{api_version}/tool-presets/ +%dir %{_datadir}/gimp/%{lib_api_version} +%{_datadir}/gimp/%{lib_api_version}/dynamics/ +%{_datadir}/gimp/%{lib_api_version}/file-raw/ +%{_datadir}/gimp/%{lib_api_version}/menus/ +%{_datadir}/gimp/%{lib_api_version}/tags/ +%{_datadir}/gimp/%{lib_api_version}/tips/ +%{_datadir}/gimp/%{lib_api_version}/tool-presets/ +%{_datadir}/gimp/%{lib_api_version}/ui/ %dir %{_libdir}/gimp -%dir %{_libdir}/gimp/%{api_version} - -%{_datadir}/gimp/%{api_version}/brushes/ -%{_datadir}/gimp/%{api_version}/fractalexplorer/ -%{_datadir}/gimp/%{api_version}/gfig/ -%{_datadir}/gimp/%{api_version}/gflare/ -%{_datadir}/gimp/%{api_version}/gimpressionist/ -%{_datadir}/gimp/%{api_version}/gradients/ -%{_datadir}/gimp/%{api_version}/icons/ -%{_datadir}/gimp/%{api_version}/images/ -%{_datadir}/gimp/%{api_version}/palettes/ -%{_datadir}/gimp/%{api_version}/patterns/ -%{_datadir}/gimp/%{api_version}/scripts/ -%{_datadir}/gimp/%{api_version}/themes/ -%{_datadir}/gimp/%{api_version}/gimp-release +%dir %{_libdir}/gimp/%{lib_api_version} + +%{_datadir}/gimp/%{lib_api_version}/brushes/ +%{_datadir}/gimp/%{lib_api_version}/fractalexplorer/ +%{_datadir}/gimp/%{lib_api_version}/gfig/ +%{_datadir}/gimp/%{lib_api_version}/gflare/ +%{_datadir}/gimp/%{lib_api_version}/gimpressionist/ +%{_datadir}/gimp/%{lib_api_version}/gradients/ +%{_datadir}/gimp/%{lib_api_version}/icons/ +%{_datadir}/gimp/%{lib_api_version}/images/ +%{_datadir}/gimp/%{lib_api_version}/palettes/ +%{_datadir}/gimp/%{lib_api_version}/patterns/ +%{_datadir}/gimp/%{lib_api_version}/scripts/ +%{_datadir}/gimp/%{lib_api_version}/themes/ +%{_datadir}/gimp/%{lib_api_version}/gimp-release
%dir %{_sysconfdir}/gimp -%dir %{_sysconfdir}/gimp/%{api_version} -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/controllerrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/gimp.css -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/gimprc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/unitrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/sessionrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/templaterc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/toolrc - -%{_bindir}/gimp-%{bin_version} -%{_bindir}/gimp-console-%{bin_version} -%{_bindir}/gimp-script-fu-interpreter-%{lib_api_version} - -%if %{with is_default_version} +%dir %{_sysconfdir}/gimp/%{lib_api_version} +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/controllerrc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/gimprc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/gtkrc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/unitrc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/sessionrc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/templaterc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/menurc +%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/toolrc + +%{_bindir}/gimp-%{binver} +%{_bindir}/gimp-console-%{binver} + +%if %{with default_binary} %{_bindir}/gimp %{_bindir}/gimp-console %endif
-%{_bindir}/gimp-test-clipboard-%{bin_version} -%{_libexecdir}/gimp-debug-tool-%{bin_version} - -%if %{with is_default_version} -%{_bindir}/gimp-test-clipboard -%{_libexecdir}/gimp-debug-tool -%endif +%{_bindir}/gimp-test-clipboard-%{lib_api_version} +%{_libexecdir}/gimp-debug-tool-%{lib_api_version}
-%{_mandir}/man1/gimp-%{bin_version}.1* -%{_mandir}/man1/gimp-console-%{bin_version}.1* -%{_mandir}/man5/gimprc-%{bin_version}.5* +%{_mandir}/man1/gimp-%{binver}.1* +%{_mandir}/man1/gimp-console-%{binver}.1* +%{_mandir}/man5/gimprc-%{binver}.5*
-%if %{with is_default_version} +%if %{with default_binary} %{_mandir}/man1/gimp.1* %{_mandir}/man1/gimp-console.1* %{_mandir}/man5/gimprc.5* %endif
-%{_datadir}/icons/hicolor/*/apps/gimp* +%{_datadir}/icons/hicolor/*/apps/gimp.png
%files libs -%license LICENSE COPYING -%doc AUTHORS NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} %{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimp-scriptfu-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimp-scriptfu-%{lib_api_version}.so.%{interface_age} %{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} %{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age} %{_libdir}/libgimpcolor-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} @@ -573,29 +440,26 @@ done %{_libdir}/libgimpui-%{lib_api_version}.so.%{interface_age} %{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} %{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age} -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/*.typelib
%files devel -%doc README.i18n -%doc devel-docs/* +%doc HACKING README.i18n +%doc %{_datadir}/gtk-doc
%{_libdir}/*.so +%ifnos linux +%{_libdir}/*.la +%{_libdir}/gimp/%{lib_api_version}/modules/*.la +%endif +%{_datadir}/aclocal/*.m4 %{_includedir}/gimp-%{lib_api_version} %{_libdir}/pkgconfig/* %{_rpmconfigdir}/macros.d/macros.gimp -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Gimp*.gir -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/gimp*.deps -%{_datadir}/vala/vapi/gimp*.vapi
%files devel-tools -%{_bindir}/gimptool-%{bin_version} -%{_mandir}/man1/gimptool-%{bin_version}.1* +%{_bindir}/gimptool-%{lib_api_version} +%{_mandir}/man1/gimptool-%{lib_api_version}.1*
-%if %{with is_default_version} +%if %{with default_binary} %{_bindir}/gimptool %{_mandir}/man1/gimptool.1* %endif diff --git a/sources b/sources index dda768a..9164bc4 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (gimp-2.99.19-git5814d9ed30.tar.xz) = 7a531bca4d1638d88bb9c8e83aa838e7c9941b84ae7113b193a4c9de0f12b221bce4d31196035b3f5988c31c291b935eb07477dbd637971df0ef23f2fbbbc40a -SHA512 (gimp-splash.png) = e4443fa1c4eaf50ce4a89681d436d9c23ccae7e3a6cac1e853bba05d851c815c59c53d52c9f3e159460d52e03b492cc48f366f6e194b7ca8c740692eb0c2d963 +SHA512 (gimp-2.10.38.tar.bz2) = 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org