From d6d131c4f03b648f760913dd39a8235fc4168f6a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 12 Feb 2025 15:12:24 +0100 Subject: [PATCH 1/4] Revert "Update to a 2025-02-12 git snapshot" This reverts commit fca64c8408bafc04d7178343bddc17820de8ee16. --- .gitignore | 1 - gimp-help.spec | 74 ++++++++------------------------------------------ sources | 2 +- 3 files changed, 12 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index e52bf64..82bfe9c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ gimp-help-2.4.2.tar.bz2 /gimp-help-2.8.2.tar.bz2 /gimp-help-2.10.0.tar.bz2 /gimp-help-2.10.34.tar.bz2 -/gimp-help-2.99.0-git2b4f24e36.tar.xz diff --git a/gimp-help.spec b/gimp-help.spec index 89a786a..863558c 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -1,40 +1,15 @@ # NOTE: en/English is in the main package -# LANGUAGES: bg,Bulgarian ca,Catalan cs,Czech da,Danish de,German el,Greek en_GB,British_English es,Spanish fa,Farsi fi,Finnish fr,French hr,Croatian hu,Hungarian it,Italian ja,Japanese ko,Korean lt,Lithuanian nl,Dutch nn,Norwegian_Nynorsk pl,Polish pt,Portuguese pt_BR,Brazilian_Portuguese ro,Romanian ru,Russian sl,Slovenian sv,Swedish tr,Turkish uk,Ukrainian zh_CN,Simplified_Chinese - -%constrain_build -m 6144 - -%global gimpsubver 3.0 +# LANGUAGES: ca,Catalan cs,Czech da,Danish de,German el,Greek en_GB,British_English es,Spanish fa,Farsi fi,Finnish fr,French hr,Croatian hu,Hungarian it,Italian ja,Japanese ko,Korean lt,Lithuanian nl,Dutch nn,Norwegian_Nynorsk pt,Portuguese pt_BR,Brazilian_Portuguese ro,Romanian ru,Russian sl,Slovenian sv,Swedish uk,Ukrainian zh_CN,Simplified_Chinese +%global gimpsubver 2.0 Summary: Help files for GIMP Name: gimp-help -Version: 2.99.0~20250212git2b4f24e36 +Version: 2.10.34 Release: %autorelease License: GFDL-1.2-invariants-only URL: https://docs.gimp.org/ +Source0: https://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 BuildArch: noarch -# https://bugzilla.redhat.com/show_bug.cgi?id=2318369 -ExcludeArch: s390x - -# 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 -} - -%if ! %defined snapshot -Source0: https://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.xz -%else -Source0: gimp-help-%{plain_version}-git%{git_rev}.tar.xz -%endif - BuildRequires: dblatex # BuildRequires: docbook2odf [orphaned] BuildRequires: docbook-style-xsl @@ -42,29 +17,23 @@ BuildRequires: gnome-doc-utils BuildRequires: libxml2-python3 BuildRequires: libxslt BuildRequires: pkgconfig >= 0.9.0 -BuildRequires: gimp-devel >= 2:3.0.0~RC1 +BuildRequires: gimp-devel >= 2:2.10 BuildRequires: gettext BuildRequires: graphviz BuildRequires: pngnq BuildRequires: pngcrush BuildRequires: python3 BuildRequires: make -Requires: gimp >= 2:3.0.0~RC1 +Requires: gimp >= 2:2.10 # BEGIN: OBSOLETE LANGUAGES +Obsoletes: gimp-help-pl < 2.10.0-1%{?dist} +Conflicts: gimp-help-pl < 2.10.0-1%{?dist} # END: OBSOLETE LANGUAGES %description This package contains a user manual written for the GNU Image Manipulation Program. # BEGIN: LANGUAGE SUB PACKAGES -%package bg -Summary: Bulgarian (bg) language support for gimp-help -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-bg) - -%description bg -Bulgarian language support for gimp-help. - %package ca Summary: Catalan (ca) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -209,14 +178,6 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-n %description nn Norwegian Nynorsk language support for gimp-help. -%package pl -Summary: Polish (pl) language support for gimp-help -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-pl) - -%description pl -Polish language support for gimp-help. - %package pt Summary: Portuguese (pt) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -265,14 +226,6 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-s %description sv Swedish language support for gimp-help. -%package tr -Summary: Turkish (tr) language support for gimp-help -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-tr) - -%description tr -Turkish language support for gimp-help. - %package uk Summary: Ukrainian (uk) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -292,13 +245,11 @@ Simplified Chinese language support for gimp-help. # END: LANGUAGE SUB PACKAGES %prep -%setup -q -n gimp-help-%{plain_version} +%setup -q %build %configure -# Building gimp-help in parallel is flaky 😬. Do as much as possible in parallel, then attempt to -# fix. -make -k %{?_smp_mflags} || make +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install @@ -326,11 +277,10 @@ popd %files %dir %{_datadir}/gimp/%{gimpsubver}/help %{_datadir}/gimp/%{gimpsubver}/help/en -%doc AUTHORS ChangeLog NEWS README.md TERMINOLOGY +%doc AUTHORS ChangeLog NEWS README TERMINOLOGY %license COPYING # BEGIN: LANGUAGE FILE LISTS -%files bg -f files.list.bg %files ca -f files.list.ca %files cs -f files.list.cs %files da -f files.list.da @@ -349,14 +299,12 @@ popd %files lt -f files.list.lt %files nl -f files.list.nl %files nn -f files.list.nn -%files pl -f files.list.pl %files pt -f files.list.pt %files pt_BR -f files.list.pt_BR %files ro -f files.list.ro %files ru -f files.list.ru %files sl -f files.list.sl %files sv -f files.list.sv -%files tr -f files.list.tr %files uk -f files.list.uk %files zh_CN -f files.list.zh_CN # END: LANGUAGE FILE LISTS diff --git a/sources b/sources index 80589fc..af0735e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-help-2.99.0-git2b4f24e36.tar.xz) = 913d0962b07f7e06c894fdcece2bd15ffadddd2765256d6a71e5756cf5df49aa983210e28b12d34e9056adef68231f9af76224f79a3dfc07eea8c17fc8edd5ff +SHA512 (gimp-help-2.10.34.tar.bz2) = 316d558f66c96a0d2d0f17baf700020b76aa221f9e220ddfc3e85b10c82b20b9c1cf36893776a342e90af5170e0102eb743b79663451581444d4f881256cf377 From 8cae8cc41af68111b848c5f890b1ceab5dbf1d15 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 20 Mar 2025 13:47:49 +0100 Subject: [PATCH 2/4] Update to 3.0.0 Signed-off-by: Nils Philippsen --- .gitignore | 1 + gimp-help.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e52bf64..c22497e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gimp-help-2.4.2.tar.bz2 /gimp-help-2.10.0.tar.bz2 /gimp-help-2.10.34.tar.bz2 /gimp-help-2.99.0-git2b4f24e36.tar.xz +/gimp-help-3.0.0.tar.bz2 diff --git a/gimp-help.spec b/gimp-help.spec index 89a786a..d277bce 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -7,7 +7,7 @@ Summary: Help files for GIMP Name: gimp-help -Version: 2.99.0~20250212git2b4f24e36 +Version: 3.0.0 Release: %autorelease License: GFDL-1.2-invariants-only URL: https://docs.gimp.org/ @@ -30,7 +30,7 @@ ExcludeArch: s390x } %if ! %defined snapshot -Source0: https://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.xz +Source0: https://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 %else Source0: gimp-help-%{plain_version}-git%{git_rev}.tar.xz %endif diff --git a/sources b/sources index 80589fc..27249ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-help-2.99.0-git2b4f24e36.tar.xz) = 913d0962b07f7e06c894fdcece2bd15ffadddd2765256d6a71e5756cf5df49aa983210e28b12d34e9056adef68231f9af76224f79a3dfc07eea8c17fc8edd5ff +SHA512 (gimp-help-3.0.0.tar.bz2) = 4a240bfebb633c1603057474adeb2bf2e42fcc65f5c5b696e5202bad18940eba69b1b12f6493b470b6f402cee7d6dcbd23f83c9e2871f459a420b7c521a0bd6d From 657f77db77d3a93ff76aba4862af6a561cdd23c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:21:23 +0000 Subject: [PATCH 3/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ea0d6fe249b37e378c15c718377f85f98c7b0d66 Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Thu, 16 Oct 2025 14:24:00 -0700 Subject: [PATCH 4/4] Use rpm's native resource tunable to limit parallelism. rpm 4.19 and newer have built-in tunable settings to limit parallel tasks which make %constrain_build redundant. See BZ#2404624 --- gimp-help.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index d277bce..6ab1594 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -1,7 +1,7 @@ # NOTE: en/English is in the main package # LANGUAGES: bg,Bulgarian ca,Catalan cs,Czech da,Danish de,German el,Greek en_GB,British_English es,Spanish fa,Farsi fi,Finnish fr,French hr,Croatian hu,Hungarian it,Italian ja,Japanese ko,Korean lt,Lithuanian nl,Dutch nn,Norwegian_Nynorsk pl,Polish pt,Portuguese pt_BR,Brazilian_Portuguese ro,Romanian ru,Russian sl,Slovenian sv,Swedish tr,Turkish uk,Ukrainian zh_CN,Simplified_Chinese -%constrain_build -m 6144 +%global _smp_tasksize_proc 6144 %global gimpsubver 3.0