From 01cd617ad79bcc363f7863ddccc212ed6c48151c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:00:00 +0000 Subject: [PATCH 01/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index d2f5c24..a33072e 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -229,6 +229,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 44416c8419808ac3cbc7ff90e964397ed70895c8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 18 Dec 2020 23:19:43 +0000 Subject: [PATCH 02/21] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gimp-help.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gimp-help.spec b/gimp-help.spec index a33072e..4400394 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -23,6 +23,7 @@ BuildRequires: graphviz BuildRequires: pngnq BuildRequires: pngcrush BuildRequires: python3 +BuildRequires: make Requires: gimp >= 2:2.10 # BEGIN: OBSOLETE LANGUAGES Obsoletes: gimp-help-sl < 2.10.0-1%{?dist} From 85d693c8d4fdb330e0825ae33c6487b967f20de4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:04:16 +0000 Subject: [PATCH 03/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index 4400394..b8d3e65 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.10.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f5a792e8fc53a0474998cf930203c707aaff6ee4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:36:40 +0000 Subject: [PATCH 04/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index b8d3e65..23fa72c 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.10.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.10.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 84c541cd240ead50f467dcd416fa5f1cc64b52b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:58:06 +0000 Subject: [PATCH 05/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index 23fa72c..bf3f4be 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.10.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.10.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 370b56870369675100fc827f5200338111c70da2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:12:48 +0000 Subject: [PATCH 06/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index bf3f4be..a550b8e 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.10.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.10.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 32313e419614e6daa9debb3ebbc445c6fac41f14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:51:36 +0000 Subject: [PATCH 07/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index a550b8e..d974cbb 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GFDL and GPLv2+ URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.10.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.10.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0f215adfc16d878a33b5615a2cebe01f74f7900d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Wed, 12 Jul 2023 10:49:57 +0200 Subject: [PATCH 08/21] Migrate to SPDX license format --- gimp-help.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gimp-help.spec b/gimp-help.spec index d974cbb..108c952 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,8 +5,8 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 10%{?dist} -License: GFDL and GPLv2+ +Release: 11%{?dist} +License: GFDL-1.2-invariants-only URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 BuildArch: noarch @@ -183,7 +183,7 @@ Simplified Chinese language support for gimp-help. %prep %setup -q -%patch1 -p1 +%patch 1 -p1 %build %configure @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Wed Jul 12 2023 Josef Ridky - 2.10.0-11 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 2.10.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 320b40d4ad248b6652c32344c54e57f39f71ecef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 22:57:55 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gimp-help.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index 108c952..2221750 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GFDL-1.2-invariants-only URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,6 +230,9 @@ popd # END: LANGUAGE FILE LISTS %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.10.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jul 12 2023 Josef Ridky - 2.10.0-11 - Migrate to SPDX license From 88478e6d9a1924efc1f4b0d2b825f18c9ad3429d Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 17 Aug 2023 16:48:48 +0200 Subject: [PATCH 10/21] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 204 ++++++++++++++++++++++++++++++++++++++++++++++++ gimp-help.spec | 207 +------------------------------------------------ 2 files changed, 206 insertions(+), 205 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..24e781e --- /dev/null +++ b/changelog @@ -0,0 +1,204 @@ +* Wed Jul 19 2023 Fedora Release Engineering - 2.10.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Josef Ridky - 2.10.0-11 +- Migrate to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 2.10.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.10.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.10.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.10.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.10.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 06 2020 Josef Ridky - 2.10.0-3 +- remplace Python 2 with Python 3 support (#1754462) + +* Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 24 2019 Josef Ridky - 2.10.0-1 +- new upstream release 2.10.0 (#1722969) +- remove unsupported languages (sl, sv) +- add new languages (fi, ro) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.8.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Josef Ridky - 2.8.2-11 +- fix FTBFS by set proper python invocation (#1604107) + +* Fri Jul 13 2018 Fedora Release Engineering - 2.8.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 21 2018 Josef Ridky - 2.8.2-9 +- remove obsolete rm buildroot statement + +* Wed Feb 07 2018 Fedora Release Engineering - 2.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Mar 04 2016 Nils Philippsen - 2.8.2-5 +- remove obsolete %%clean, %%defattr, Group and BuildRoot tags + +* Thu Mar 03 2016 Parag Nemade - 2.8.2-5 +- Mark COPYING with %%license instead of %%doc + +* Thu Mar 03 2016 Nils Philippsen - 2.8.2-5 +- add supplements directives for language subpackages, see + https://fedoraproject.org/wiki/Packaging:Langpacks for detail + +* Wed Feb 03 2016 Fedora Release Engineering - 2.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 19 2016 Nils Philippsen +- use %%global instead of %%define + +* Tue Jun 23 2015 Nils Philippsen - 2.8.2-3 +- fix website URL +- disable parallel building because it tends to produce bad output + +* Wed Jun 17 2015 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Aug 05 2014 Nils Philippsen - 2.8.2-1 +- version 2.8.2 +- update source URL + +* Sat Jun 07 2014 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jan 09 2014 Nils Philippsen - 2.8.1-1 +- version 2.8.1 +- reenable parallel building +- add Brazilian Portuguese translation +- remove (empty) translations: Finnish, Hungarian, Lithuanian, Polish +- fix translation that makes xml2po.py/libxml2 crash + +* Sat Aug 03 2013 Fedora Release Engineering - 2.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 09 2013 Nils Philippsen - 2.8.0-7 +- add GPLv2+ to license list (included tools used for building) + +* Tue May 14 2013 Nils Philippsen - 2.8.0-6 +- don't attempt parallel builds, they succeed or fail without a clear pattern + +* Mon May 13 2013 Nils Philippsen - 2.8.0-5 +- include all PO files missing from the tarball (#914031) + +* Wed Feb 13 2013 Fedora Release Engineering - 2.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Nils Philippsen - 2.8.0-2 +- add language subpackages + +* Tue Jun 05 2012 Nils Philippsen - 2.8.0-1 +- version 2.8.0 +- add po files missing in tarball +- add new build requirements: dblatex, graphviz, pngnq, pngcrush +- fix file list generation + +* Fri Jan 13 2012 Fedora Release Engineering - 2.4.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2.4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 2.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 2.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 12 2008 Nils Philippsen - 2.4.2-3 +- Merge Review (#225798): + - quote percent signs written into files list + - enable parallel make + +* Thu Dec 11 2008 Nils Philippsen - 2.4.2-2 +- Merge Review (#225798): + - ship AUTHORS, ChangeLog, COPYING, NEWS, README, TERMINOLOGY + - don't own directories included in the gimp package + - use %%defattr(-, root, root, -) + +* Wed Nov 26 2008 Nils Philippsen +- Group: Documentation + +* Fri Oct 10 2008 Nils Philippsen - 2.4.2-1 +- version 2.4.2 + +* Fri Apr 18 2008 Nils Philippsen - 2.4.1-1 +- version 2.4.1 + +* Mon Feb 04 2008 Nils Philippsen - 2.4.0-1 +- version 2.4.0 +- mark language specific files with %%lang() +- add BR: gettext + +* Wed Aug 08 2007 Nils Philippsen - 2-0.2.0.13 +- change licensing tag to GFDL + +* Wed Aug 08 2007 Nils Philippsen - 2-0.1.0.13 +- version 2-0.13 +- don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing + +* Thu Apr 12 2007 Nils Philippsen - 2-0.1.0.12 +- version 2-0.12 + +* Thu Jan 04 2007 Nils Philippsen - 2-0.1.0.11 +- version 2-0.11 +- add disttag + +* Wed Jul 12 2006 Jesse Keating - 2-0.1.0.10.1.1 +- rebuild + +* Mon Apr 24 2006 Nils Philippsen +- version 2-0.10 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Oct 21 2005 Nils Philippsen +- version 2-0.9 + +* Wed Feb 23 2005 Nils Philippsen +- version 2-0.7 + +* Sat Jan 15 2005 Nils Philippsen +- version 2-0.6 + +* Fri Jul 02 2004 Nils Philippsen +- version 2-0.3 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 02 2004 Nils Philippsen +- version 2-0.2 + +* Wed Mar 17 2004 Nils Philippsen +- version 2-0.1 +- initial build diff --git a/gimp-help.spec b/gimp-help.spec index 2221750..8d1add6 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -5,7 +5,7 @@ Summary: Help files for GIMP Name: gimp-help Version: 2.10.0 -Release: 12%{?dist} +Release: %autorelease License: GFDL-1.2-invariants-only URL: http://docs.gimp.org/ Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 @@ -230,207 +230,4 @@ popd # END: LANGUAGE FILE LISTS %changelog -* Wed Jul 19 2023 Fedora Release Engineering - 2.10.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 12 2023 Josef Ridky - 2.10.0-11 -- Migrate to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 2.10.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.10.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.10.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2.10.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.10.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.10.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 06 2020 Josef Ridky - 2.10.0-3 -- remplace Python 2 with Python 3 support (#1754462) - -* Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 24 2019 Josef Ridky - 2.10.0-1 -- new upstream release 2.10.0 (#1722969) -- remove unsupported languages (sl, sv) -- add new languages (fi, ro) - -* Thu Jan 31 2019 Fedora Release Engineering - 2.8.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Josef Ridky - 2.8.2-11 -- fix FTBFS by set proper python invocation (#1604107) - -* Fri Jul 13 2018 Fedora Release Engineering - 2.8.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 21 2018 Josef Ridky - 2.8.2-9 -- remove obsolete rm buildroot statement - -* Wed Feb 07 2018 Fedora Release Engineering - 2.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.8.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.8.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Mar 04 2016 Nils Philippsen - 2.8.2-5 -- remove obsolete %%clean, %%defattr, Group and BuildRoot tags - -* Thu Mar 03 2016 Parag Nemade - 2.8.2-5 -- Mark COPYING with %%license instead of %%doc - -* Thu Mar 03 2016 Nils Philippsen - 2.8.2-5 -- add supplements directives for language subpackages, see - https://fedoraproject.org/wiki/Packaging:Langpacks for detail - -* Wed Feb 03 2016 Fedora Release Engineering - 2.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 19 2016 Nils Philippsen -- use %%global instead of %%define - -* Tue Jun 23 2015 Nils Philippsen - 2.8.2-3 -- fix website URL -- disable parallel building because it tends to produce bad output - -* Wed Jun 17 2015 Fedora Release Engineering - 2.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Aug 05 2014 Nils Philippsen - 2.8.2-1 -- version 2.8.2 -- update source URL - -* Sat Jun 07 2014 Fedora Release Engineering - 2.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jan 09 2014 Nils Philippsen - 2.8.1-1 -- version 2.8.1 -- reenable parallel building -- add Brazilian Portuguese translation -- remove (empty) translations: Finnish, Hungarian, Lithuanian, Polish -- fix translation that makes xml2po.py/libxml2 crash - -* Sat Aug 03 2013 Fedora Release Engineering - 2.8.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 09 2013 Nils Philippsen - 2.8.0-7 -- add GPLv2+ to license list (included tools used for building) - -* Tue May 14 2013 Nils Philippsen - 2.8.0-6 -- don't attempt parallel builds, they succeed or fail without a clear pattern - -* Mon May 13 2013 Nils Philippsen - 2.8.0-5 -- include all PO files missing from the tarball (#914031) - -* Wed Feb 13 2013 Fedora Release Engineering - 2.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 2.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 19 2012 Nils Philippsen - 2.8.0-2 -- add language subpackages - -* Tue Jun 05 2012 Nils Philippsen - 2.8.0-1 -- version 2.8.0 -- add po files missing in tarball -- add new build requirements: dblatex, graphviz, pngnq, pngcrush -- fix file list generation - -* Fri Jan 13 2012 Fedora Release Engineering - 2.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 2.4.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 2.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Dec 12 2008 Nils Philippsen - 2.4.2-3 -- Merge Review (#225798): - - quote percent signs written into files list - - enable parallel make - -* Thu Dec 11 2008 Nils Philippsen - 2.4.2-2 -- Merge Review (#225798): - - ship AUTHORS, ChangeLog, COPYING, NEWS, README, TERMINOLOGY - - don't own directories included in the gimp package - - use %%defattr(-, root, root, -) - -* Wed Nov 26 2008 Nils Philippsen -- Group: Documentation - -* Fri Oct 10 2008 Nils Philippsen - 2.4.2-1 -- version 2.4.2 - -* Fri Apr 18 2008 Nils Philippsen - 2.4.1-1 -- version 2.4.1 - -* Mon Feb 04 2008 Nils Philippsen - 2.4.0-1 -- version 2.4.0 -- mark language specific files with %%lang() -- add BR: gettext - -* Wed Aug 08 2007 Nils Philippsen - 2-0.2.0.13 -- change licensing tag to GFDL - -* Wed Aug 08 2007 Nils Philippsen - 2-0.1.0.13 -- version 2-0.13 -- don't use "%%makeinstall ..." but "make DESTDIR=... install" for installing - -* Thu Apr 12 2007 Nils Philippsen - 2-0.1.0.12 -- version 2-0.12 - -* Thu Jan 04 2007 Nils Philippsen - 2-0.1.0.11 -- version 2-0.11 -- add disttag - -* Wed Jul 12 2006 Jesse Keating - 2-0.1.0.10.1.1 -- rebuild - -* Mon Apr 24 2006 Nils Philippsen -- version 2-0.10 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Oct 21 2005 Nils Philippsen -- version 2-0.9 - -* Wed Feb 23 2005 Nils Philippsen -- version 2-0.7 - -* Sat Jan 15 2005 Nils Philippsen -- version 2-0.6 - -* Fri Jul 02 2004 Nils Philippsen -- version 2-0.3 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Apr 02 2004 Nils Philippsen -- version 2-0.2 - -* Wed Mar 17 2004 Nils Philippsen -- version 2-0.1 -- initial build +%autochangelog From ccd5afb8e513f2ad68a505001ad2772fcf68d700 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 20 Aug 2023 16:47:41 +0200 Subject: [PATCH 11/21] Modernize and fix apply-languages.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use f-strings - Reformat with black - Don’t attempt to reuse zip object to fix obsoletes management - Don’t expect group tag [skip changelog] Signed-off-by: Nils Philippsen --- apply-languages.py | 181 +++++++++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 73 deletions(-) diff --git a/apply-languages.py b/apply-languages.py index 6267f27..1ddf6f5 100755 --- a/apply-languages.py +++ b/apply-languages.py @@ -28,10 +28,12 @@ import re from stat import S_IMODE from itertools import islice + def usage(): - print("Usage: {} .spec".format(sys.argv[0]), file=sys.stderr) + print(f"Usage: {sys.argv[0]} .spec", file=sys.stderr) sys.exit(1) + def cleantmpfile(): global newfspath @@ -40,12 +42,13 @@ def cleantmpfile(): except OSError: pass + if len(sys.argv) != 2: usage() sfpath = sys.argv[1] if not os.access(sfpath, os.R_OK | os.W_OK): - print("Not readable/writable:", sfpath, file=sys.stderr) + print(f"Not readable/writable: {sfpath}", file=sys.stderr) sys.exit(2) sfdir = os.path.dirname(sfpath) @@ -62,72 +65,87 @@ sf.close() sfmode = S_IMODE(os.stat(sfpath).st_mode) languages_re = re.compile( - r"^#\s*LANGUAGES:\s*(?P[^\n\r]+)\s*$", re.MULTILINE) + r"^#\s*LANGUAGES:\s*(?P[^\n\r]+)\s*$", re.MULTILINE +) langsplit_re = re.compile(r"\s+") begin_obsoletes_re = re.compile( - r"^#\s*BEGIN:\s*OBSOLETE\s+LANGUAGES\s*$", re.MULTILINE) + r"^#\s*BEGIN:\s*OBSOLETE\s+LANGUAGES\s*$", re.MULTILINE +) end_obsoletes_re = re.compile( - r"^#\s*END:\s*OBSOLETE\s+LANGUAGES\s*$", re.MULTILINE) + r"^#\s*END:\s*OBSOLETE\s+LANGUAGES\s*$", re.MULTILINE +) begin_langpkgs_re = re.compile( - r"^#\s*BEGIN:\s*LANGUAGE\s+SUB\s+PACKAGES\s*$", re.MULTILINE) + r"^#\s*BEGIN:\s*LANGUAGE\s+SUB\s+PACKAGES\s*$", re.MULTILINE +) end_langpkgs_re = re.compile( - r"^#\s*END:\s*LANGUAGE\s+SUB\s+PACKAGES\s*$", re.MULTILINE) + r"^#\s*END:\s*LANGUAGE\s+SUB\s+PACKAGES\s*$", re.MULTILINE +) begin_langfiles_re = re.compile( - r"^#\s*BEGIN:\s*LANGUAGE\s+FILE\s+LISTS\s*$", re.MULTILINE) + r"^#\s*BEGIN:\s*LANGUAGE\s+FILE\s+LISTS\s*$", re.MULTILINE +) end_langfiles_re = re.compile( - r"^#\s*END:\s*LANGUAGE\s+FILE\s+LISTS\s*$", re.MULTILINE) + r"^#\s*END:\s*LANGUAGE\s+FILE\s+LISTS\s*$", re.MULTILINE +) -name_re = re.compile(r"^name:\s*(?P[^\n\r]+)\s*$", - re.MULTILINE | re.IGNORECASE) -version_re = re.compile(r"^version:\s*(?P[^\n\r]+)\s*$", - re.MULTILINE | re.IGNORECASE) -release_re = re.compile(r"^release:\s*(?P[^\n\r]+)\s*$", - re.MULTILINE | re.IGNORECASE) -license_re = re.compile(r"^license:\s*(?P[^\n\r]+)\s*$", - re.MULTILINE | re.IGNORECASE) -pkg_re = re.compile(r"^%package\s*(?P\S+)\s*$", - re.MULTILINE | re.IGNORECASE) -group_re = re.compile(r"^group:\s*(?P[^\n\r]+)\s*$", - re.MULTILINE | re.IGNORECASE) +name_re = re.compile( + r"^name:\s*(?P[^\n\r]+)\s*$", re.MULTILINE | re.IGNORECASE +) +version_re = re.compile( + r"^version:\s*(?P[^\n\r]+)\s*$", re.MULTILINE | re.IGNORECASE +) +release_re = re.compile( + r"^release:\s*(?P[^\n\r]+)\s*$", re.MULTILINE | re.IGNORECASE +) +license_re = re.compile( + r"^license:\s*(?P[^\n\r]+)\s*$", re.MULTILINE | re.IGNORECASE +) +pkg_re = re.compile( + r"^%package\s*(?P\S+)\s*$", re.MULTILINE | re.IGNORECASE +) missing = False -for what, what_re in (("name tag", name_re), ("license tag", license_re), - ("group tag", group_re), ("LANGUAGES comment", languages_re), - ("BEGIN: OBSOLETE LANGUAGES comment", begin_obsoletes_re), - ("END: OBSOLETE LANGUAGES comment", end_obsoletes_re), - ("BEGIN: LANGUAGE SUB PACKAGES comment", begin_langpkgs_re), - ("END: LANGUAGE SUB PACKAGES comment", end_langpkgs_re), - ("BEGIN: LANGUAGE FILE LISTS comment", begin_langfiles_re), - ("END: LANGUAGE FILE LISTS comment", end_langfiles_re), - ): +for what, what_re in ( + ("name tag", name_re), + ("license tag", license_re), + ("LANGUAGES comment", languages_re), + ("BEGIN: OBSOLETE LANGUAGES comment", begin_obsoletes_re), + ("END: OBSOLETE LANGUAGES comment", end_obsoletes_re), + ("BEGIN: LANGUAGE SUB PACKAGES comment", begin_langpkgs_re), + ("END: LANGUAGE SUB PACKAGES comment", end_langpkgs_re), + ("BEGIN: LANGUAGE FILE LISTS comment", begin_langfiles_re), + ("END: LANGUAGE FILE LISTS comment", end_langfiles_re), +): found = what_re.search(sfcontent) if found is None: - print("{} not found".format(what), file=sys.stderr) + print(f"{what} not found", file=sys.stderr) missing = True if missing: sys.exit(2) langspecs = langsplit_re.split( - languages_re.search(sfcontent).group('languages')) -#languages = [] -#for ls in langspecs: + languages_re.search(sfcontent).group("languages") +) +# languages = [] +# for ls in langspecs: # langcode, langname = ls.split(",") # languages.append((langcode, langname)) -languages = [(x.split(",")[0], x.split(",")[1].replace('_', ' ')) - for x in langspecs] +languages = [ + (x.split(",")[0], x.split(",")[1].replace("_", " ")) for x in langspecs +] langcodes = set((x[0] for x in languages)) -name = name_re.search(sfcontent).group('name') -version = version_re.search(sfcontent).group('version') -release = release_re.search(sfcontent).group('release') -license = license_re.search(sfcontent).group('license') -group = group_re.search(sfcontent).group('group') +name = name_re.search(sfcontent).group("name") +version = version_re.search(sfcontent).group("version") +release = release_re.search(sfcontent).group("release") +license = license_re.search(sfcontent).group("license") obsoletes_re = re.compile( - r"^obsoletes:\s*{}-(?P(?P\S+)\s*.*)$".format(name), - re.MULTILINE | re.IGNORECASE) + fr"^obsoletes:\s*{name}-(?P(?P\S+)\s*.*)$", + re.MULTILINE | re.IGNORECASE, +) conflicts_re = re.compile( - r"^conflicts:\s*{}-(?P(?P\S+)\s*.*)$".format(name), - re.MULTILINE | re.IGNORECASE) + fr"^conflicts:\s*{name}-(?P(?P\S+)\s*.*)$", + re.MULTILINE | re.IGNORECASE, +) numlang = len(languages) replacing = None @@ -138,13 +156,17 @@ if sflines[-1] == "": # handle obsoleting language subpackages preprocess_state_transitions = { - 'out': ( - begin_obsoletes_re, 'in_obsoletes', begin_langpkgs_re, 'in_langpkgs'), - 'in_obsoletes': (end_obsoletes_re, 'out'), - 'in_langpkgs': (end_langpkgs_re, 'out'), - } + "out": ( + begin_obsoletes_re, + "in_obsoletes", + begin_langpkgs_re, + "in_langpkgs", + ), + "in_obsoletes": (end_obsoletes_re, "out"), + "in_langpkgs": (end_langpkgs_re, "out"), +} -state = 'out' +state = "out" state_change = True found_obsoleted_langs = set() @@ -153,8 +175,12 @@ found_lang_pkgs = set() for line in sflines: if state_change: transitions = preprocess_state_transitions[state] - packed_transitions = zip( - islice(transitions, 0, None, 2), islice(transitions, 1, None, 2)) + packed_transitions = list( + zip( + islice(transitions, 0, None, 2), + islice(transitions, 1, None, 2), + ) + ) state_change = False for regex, new_state in packed_transitions: @@ -165,14 +191,14 @@ for line in sflines: if state_change: continue - if state == 'in_obsoletes': + if state == "in_obsoletes": m = obsoletes_re.match(line) if m: - found_obsoleted_langs.add(m.group('lang')) - elif state == 'in_langpkgs': + found_obsoleted_langs.add(m.group("lang")) + elif state == "in_langpkgs": m = pkg_re.match(line) if m: - found_lang_pkgs.add(m.group('pkg')) + found_lang_pkgs.add(m.group("pkg")) langcodes_to_obsolete = found_lang_pkgs - langcodes langcodes_to_unobsolete = found_obsoleted_langs & langcodes @@ -183,12 +209,12 @@ for line in sflines: if not replacing: print(line, file=newsf) if begin_obsoletes_re.match(line): - replacing = 'obsoletes' + replacing = "obsoletes" elif begin_langpkgs_re.match(line): - replacing = 'langpkgs' + replacing = "langpkgs" elif begin_langfiles_re.match(line): - replacing = 'langfiles' - elif replacing == 'obsoletes': + replacing = "langfiles" + elif replacing == "obsoletes": om = obsoletes_re.match(line) cm = conflicts_re.match(line) em = end_obsoletes_re.match(line) @@ -197,42 +223,51 @@ for line in sflines: replacing = None for lang in langcodes_to_obsolete: print( - "Obsoletes: {name}-{lang} < {version}-{release}\n" - "Conflicts: {name}-{lang} < {version}-{release}".format( - **locals()), file=newsf) + f"Obsoletes: {name}-{lang} < {version}-{release}\n" + + f"Conflicts: {name}-{lang} < {version}-{release}", + file=newsf, + ) print(line, file=newsf) elif not (om or cm): if not gobble: print(line, file=newsf) elif ( - om and om.group('lang') not in langcodes_to_unobsolete or - cm and cm.group('lang') not in langcodes_to_unobsolete): + om + and om.group("lang") not in langcodes_to_unobsolete + or cm + and cm.group("lang") not in langcodes_to_unobsolete + ): gobble = False print(line, file=newsf) else: gobble = True - elif replacing == 'langpkgs': + elif replacing == "langpkgs": if end_langpkgs_re.match(line): replacing = None for no, lang in enumerate(languages): langcode, langname = lang - print("""%package {langcode} + print( + f"""%package {langcode} Summary: {langname} ({langcode}) language support for {name} Requires: %{{name}} = %{{?epoch:%{{epoch}}:}}%{{version}}-%{{release}} -Supplements: (%{{name}} = %{{?epoch:%{{epoch}}:}}%{{version}}-%{{release}} and langpacks-{langcode}) +Supplements: (%{{name}} = %{{?epoch:%{{epoch}}:}}%{{version}}-%{{release}}""" + + f""" and langpacks-{langcode}) %description {langcode} -{langname} language support for {name}.""".format(**locals()), file=newsf) +{langname} language support for {name}.""", + file=newsf, + ) if no < numlang: print(file=newsf) print(line, file=newsf) - elif replacing == 'langfiles': + elif replacing == "langfiles": if end_langfiles_re.match(line): replacing = None for lang in languages: langcode, langname = lang - print("%files {langcode} -f files.list.{langcode}".format( - langcode=langcode), file=newsf) + print( + f"%files {langcode} -f files.list.{langcode}", file=newsf + ) print(line, file=newsf) newsf.close() From c4a5cd5da71e9e7a7681606411b1200b03e9010a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 20 Aug 2023 16:42:00 +0200 Subject: [PATCH 12/21] New upstream release 2.10.34 - Use https URLs - Add new languages - Build in parallel again - Include PDF cheat sheets Signed-off-by: Nils Philippsen --- .gitignore | 1 + gimp-help-2.10.0-python3.patch | 314 --------------------------------- gimp-help.spec | 114 ++++++++++-- sources | 2 +- 4 files changed, 99 insertions(+), 332 deletions(-) delete mode 100644 gimp-help-2.10.0-python3.patch diff --git a/.gitignore b/.gitignore index d0139cc..82bfe9c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gimp-help-2.4.2.tar.bz2 /gimp-help-2.8.1.tar.bz2 /gimp-help-2.8.2.tar.bz2 /gimp-help-2.10.0.tar.bz2 +/gimp-help-2.10.34.tar.bz2 diff --git a/gimp-help-2.10.0-python3.patch b/gimp-help-2.10.0-python3.patch deleted file mode 100644 index 66a22bf..0000000 --- a/gimp-help-2.10.0-python3.patch +++ /dev/null @@ -1,314 +0,0 @@ -diff -urNp a/tools/xml2po/__init__.py b/tools/xml2po/__init__.py ---- a/tools/xml2po/__init__.py 2019-11-28 11:45:00.889048989 +0100 -+++ b/tools/xml2po/__init__.py 2020-01-06 13:24:24.715787902 +0100 -@@ -86,14 +86,14 @@ class MessageOutput: - self.messages.append(t) - if spacepreserve: - self.nowrap[t] = True -- if t in self.linenos.keys(): -+ if t in list(self.linenos.keys()): - self.linenos[t].append((self.filename, tag, lineno)) - else: - self.linenos[t] = [ (self.filename, tag, lineno) ] - if (not self.do_translations) and comment and not t in self.comments: - self.comments[t] = comment - else: -- if t in self.linenos.keys(): -+ if t in list(self.linenos.keys()): - self.linenos[t].append((self.filename, tag, lineno)) - else: - self.linenos[t] = [ (self.filename, tag, lineno) ] -@@ -166,7 +166,7 @@ class XMLDocument(object): - elif node.isText(): - if node.isBlankNode(): - if self.app.options.get('expand_entities') or \ -- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ): -+ (not (node.prev and not node.prev.isBlankNode() and node.nextElementSibling() and not node.next.isBlankNode()) ): - #print >>sys.stderr, "BLANK" - node.setContent('') - else: -@@ -200,7 +200,7 @@ class XMLDocument(object): - tree = ctxt.doc() - newnode = tree.getRootElement() - except: -- print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text) -+ print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr) - return text - - self.normalizeNode(newnode) -@@ -259,7 +259,7 @@ class XMLDocument(object): - if not self.expand_entities: - result += '&' + child.name + ';' - else: -- result += child.content.decode('utf-8') -+ result += child.content - else: - result += self.myAttributeSerialize(child) - child = child.next -@@ -326,7 +326,7 @@ class XMLDocument(object): - pass - - content = '<%s>%s' % (starttag, text, endtag) -- tmp = tmp + content.encode('utf-8') -+ tmp = tmp + content - - newnode = None - try: -@@ -338,7 +338,7 @@ class XMLDocument(object): - pass - - if not newnode: -- print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')) -+ print("""Error while parsing translation as XML:\n"%s"\n""" % (text), file=sys.stderr) - return - - newelem = newnode.getRootElement() -@@ -354,7 +354,7 @@ class XMLDocument(object): - copy = newelem.copyNodeList() - next = node.next - node.replaceNode(newelem.copyNodeList()) -- node.next = next -+ node.__next__ = next - - else: - # In practice, this happens with tags such as " " (only whitespace in between) -@@ -406,7 +406,7 @@ class XMLDocument(object): - translation = self.app.getTranslation(outtxt) # unicode or None - if translation is not None: - self.replaceAttributeContentsWithText(attr, -- translation.encode('utf-8')) -+ translation) - else: - self.app.msg.outputMessage(outtxt, node.lineNo(), "", spacepreserve=False, - tag = node.name + ":" + attr.name) -@@ -447,14 +447,14 @@ class XMLDocument(object): - norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node)) - translation = self.app.getTranslation(norm_outtxt) - else: -- translation = outtxt.decode('utf-8') -+ translation = outtxt - - starttag = self.startTagForNode(node) - endtag = self.endTagForNode(node) - - worth = self.worthOutputting(node) - if not translation: -- translation = outtxt.decode('utf-8') -+ translation = outtxt - if worth and self.app.options.get('mark_untranslated'): - node.setLang('C') - -@@ -463,7 +463,7 @@ class XMLDocument(object): - # repl[0] may contain translated attributes with - # non-ASCII chars, so implicit conversion to may fail - replacement = '<%s>%s' % \ -- (repl[0].decode('utf-8'), repl[3], repl[2]) -+ (repl[0], repl[3], repl[2]) - translation = translation.replace('' % (i+1), replacement) - - if worth: -@@ -542,7 +542,7 @@ class Main(object): - elif output == '-': - self.out = sys.stdout - else: -- self.out = file(output, 'w') -+ self.out = open(output, 'w') - - def load_mode(self, modename): - try: -@@ -565,7 +565,7 @@ class Main(object): - try: - doc = XMLDocument(xmlfile, self) - except Exception as e: -- print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e)) -+ print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr) - sys.exit(1) - self.current_mode.preProcessXml(doc.doc, self.msg) - doc.generate_messages() -@@ -578,13 +578,13 @@ class Main(object): - try: - doc = XMLDocument(xmlfile, self) - except Exception as e: -- print >> sys.stderr, str(e) -+ print(str(e), file=sys.stderr) - sys.exit(1) - - try: - mfile = open(mofile, "rb") - except: -- print >> sys.stderr, "Can't open MO file '%s'." % (mofile) -+ print("Can't open MO file '%s'." % (mofile), file=sys.stderr) - self.gt = gettext.GNUTranslations(mfile) - self.gt.add_fallback(NoneTranslations()) - # Has preProcessXml use cases for merge? -@@ -607,7 +607,7 @@ class Main(object): - try: - doc = XMLDocument(xmlfile, self) - except Exception as e: -- print >> sys.stderr, str(e) -+ print(str(e), file=sys.stderr) - sys.exit(1) - doc.generate_messages() - -@@ -615,7 +615,7 @@ class Main(object): - try: - doc = XMLDocument(origxml, self) - except Exception as e: -- print >> sys.stderr, str(e) -+ print(str(e), file=sys.stderr) - sys.exit(1) - doc.generate_messages() - self.output_po() -@@ -646,11 +646,11 @@ class Main(object): - - text should be a string to look for. - """ -- #print >>sys.stderr,"getTranslation('%s')" % (text.encode('utf-8')) -+ #print >>sys.stderr,"getTranslation('%s')" % (text) - if not text or text.strip() == '': - return text - if self.gt: -- res = self.gt.ugettext(text.decode('utf-8')) -+ res = self.gt.gettext(text) - return res - - return text -diff -urNp a/tools/xml2po/modes/docbook.py b/tools/xml2po/modes/docbook.py ---- a/tools/xml2po/modes/docbook.py 2019-11-28 11:45:00.889048989 +0100 -+++ b/tools/xml2po/modes/docbook.py 2020-01-06 13:10:18.324679751 +0100 -@@ -43,7 +43,7 @@ try: - except ImportError: - from md5 import new as md5_new - --from basic import basicXmlMode -+from .basic import basicXmlMode - - class docbookXmlMode(basicXmlMode): - """Class for special handling of DocBook document types. -@@ -131,7 +131,7 @@ class docbookXmlMode(basicXmlMode): - hash = self._md5_for_file(fullpath) - else: - hash = "THIS FILE DOESN'T EXIST" -- print >>sys.stderr, "Warning: image file '%s' not found." % fullpath -+ print("Warning: image file '%s' not found." % fullpath, file=sys.stderr) - - msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(), - "When image changes, this message will be marked fuzzy or untranslated for you.\n"+ -@@ -184,7 +184,7 @@ class docbookXmlMode(basicXmlMode): - else: - ai.addChild(copy) - if match.group(3): -- copy.newChild(None, "year", match.group(3).encode('utf-8')) -+ copy.newChild(None, "year", match.group(3)) - if match.group(1) and match.group(2): - holder = match.group(1)+"(%s)" % match.group(2) - elif match.group(1): -@@ -193,15 +193,15 @@ class docbookXmlMode(basicXmlMode): - holder = match.group(2) - else: - holder = "???" -- copy.newChild(None, "holder", holder.encode('utf-8')) -+ copy.newChild(None, "holder", holder) - - # Perform some tests when ran standalone - if __name__ == '__main__': - test = docbookXmlMode() -- print "Ignored tags : " + repr(test.getIgnoredTags()) -- print "Final tags : " + repr(test.getFinalTags()) -- print "Space-preserve tags: " + repr(test.getSpacePreserveTags()) -+ print("Ignored tags : " + repr(test.getIgnoredTags())) -+ print("Final tags : " + repr(test.getFinalTags())) -+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags())) - -- print "Credits from string: '%s'" % test.getStringForTranslators() -- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators() -+ print("Credits from string: '%s'" % test.getStringForTranslators()) -+ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()) - -diff -urNp a/tools/xml2po/modes/gimphelp.py b/tools/xml2po/modes/gimphelp.py ---- a/tools/xml2po/modes/gimphelp.py 2019-11-28 11:45:00.889048989 +0100 -+++ b/tools/xml2po/modes/gimphelp.py 2020-01-06 11:59:17.387855373 +0100 -@@ -31,7 +31,7 @@ try: - except ImportError: - from md5 import new as md5_new - --from docbook import docbookXmlMode -+from .docbook import docbookXmlMode - - class gimphelpXmlMode(docbookXmlMode): - """Class for special handling of gimp-help DocBook document types. -@@ -91,10 +91,10 @@ class gimphelpXmlMode(docbookXmlMode): - # Perform some tests when ran standalone - if __name__ == '__main__': - test = gimphelpXmlMode() -- print "Ignored tags : " + repr(test.getIgnoredTags()) -- print "Final tags : " + repr(test.getFinalTags()) -- print "Space-preserve tags: " + repr(test.getSpacePreserveTags()) -+ print("Ignored tags : " + repr(test.getIgnoredTags())) -+ print("Final tags : " + repr(test.getFinalTags())) -+ print("Space-preserve tags: " + repr(test.getSpacePreserveTags())) - -- print "Credits from string: '%s'" % test.getStringForTranslators() -- print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators() -+ print("Credits from string: '%s'" % test.getStringForTranslators()) -+ print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()) - -diff -urNp a/tools/xml2po.py b/tools/xml2po.py ---- a/tools/xml2po.py 2019-11-28 11:45:00.889048989 +0100 -+++ b/tools/xml2po.py 2020-01-06 11:59:17.387855373 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- encoding: utf-8 -*- - # Copyright (c) 2004, 2005, 2006 Danilo Šegan . - # Copyright (c) 2009 Claude Paroz . -@@ -41,9 +41,9 @@ NULL_STRING = '/dev/null' - if not os.path.exists('/dev/null'): NULL_STRING = 'NUL' - - def usage (with_help = False): -- print >> sys.stderr, "Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]) -+ print("Usage: %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr) - if with_help: -- print >> sys.stderr, """ -+ print(""" - OPTIONS may be some of: - -a --automatic-tags Automatically decides if tags are to be considered - "final" or not -@@ -72,7 +72,7 @@ EXAMPLES: - using -p option for each XML file: - %(command)s -p de.po chapter1.xml > chapter1.de.xml - %(command)s -p de.po chapter2.xml > chapter2.de.xml --""" % {'command': sys.argv[0]} -+""" % {'command': sys.argv[0]}, file=sys.stderr) - - - def main(argv): -@@ -148,7 +148,7 @@ def main(argv): - sys.exit(0) - - if operation == 'update' and output != "-": -- print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option." -+ print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr) - - # Treat remaining arguments as XML files - filenames = [] -@@ -158,16 +158,16 @@ def main(argv): - try: - xml2po_main = Main(default_mode, operation, output, options) - except IOError: -- print >> sys.stderr, "Error: cannot open file %s for writing." % (output) -+ print("Error: cannot open file %s for writing." % (output), file=sys.stderr) - sys.exit(5) - - if operation == 'merge': - if len(filenames) > 1: -- print >> sys.stderr, "Error: You can merge translations with only one XML file at a time." -+ print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr) - sys.exit(2) - - if not mofile: -- print >> sys.stderr, "Error: You must specify MO file when merging translations." -+ print("Error: You must specify MO file when merging translations.", file=sys.stderr) - sys.exit(3) - - xml2po_main.merge(mofile, filenames[0]) diff --git a/gimp-help.spec b/gimp-help.spec index 8d1add6..81a7510 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -1,14 +1,14 @@ # NOTE: en/English is in the main package -# LANGUAGES: ca,Catalan da,Danish de,German el,Greek en_GB,British_English es,Spanish fr,French it,Italian ja,Japanese ko,Korean nl,Dutch nn,Norwegian_Nynorsk pt_BR,Brazilian_Portuguese ru,Russian sl,Slovenian sv,Swedish zh_CN,Simplified_Chinese +# 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.10.0 +Version: 2.10.34 Release: %autorelease License: GFDL-1.2-invariants-only -URL: http://docs.gimp.org/ -Source0: http://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 +URL: https://docs.gimp.org/ +Source0: https://download.gimp.org/pub/gimp/help/gimp-help-%{version}.tar.bz2 BuildArch: noarch BuildRequires: dblatex # BuildRequires: docbook2odf [orphaned] @@ -26,18 +26,9 @@ BuildRequires: python3 BuildRequires: make Requires: gimp >= 2:2.10 # BEGIN: OBSOLETE LANGUAGES -Obsoletes: gimp-help-sl < 2.10.0-1%{?dist} -Conflicts: gimp-help-sl < 2.10.0-1%{?dist} -Obsoletes: gimp-help-sv < 2.10.0-1%{?dist} -Conflicts: gimp-help-sv < 2.10.0-1%{?dist} -Obsoletes: gimp-help-hr < 2.10.0-1%{?dist} -Conflicts: gimp-help-hr < 2.10.0-1%{?dist} -Obsoletes: gimp-help-lt < 2.10.0-1%{?dist} -Conflicts: gimp-help-lt < 2.10.0-1%{?dist} Obsoletes: gimp-help-pl < 2.10.0-1%{?dist} Conflicts: gimp-help-pl < 2.10.0-1%{?dist} # END: OBSOLETE LANGUAGES -Patch1: gimp-help-2.10.0-python3.patch %description This package contains a user manual written for the GNU Image Manipulation Program. @@ -51,6 +42,14 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-c %description ca Catalan language support for gimp-help. +%package cs +Summary: Czech (cs) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-cs) + +%description cs +Czech language support for gimp-help. + %package da Summary: Danish (da) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -91,6 +90,14 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-e %description es Spanish language support for gimp-help. +%package fa +Summary: Farsi (fa) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-fa) + +%description fa +Farsi language support for gimp-help. + %package fi Summary: Finnish (fi) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -107,6 +114,22 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-f %description fr French language support for gimp-help. +%package hr +Summary: Croatian (hr) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-hr) + +%description hr +Croatian language support for gimp-help. + +%package hu +Summary: Hungarian (hu) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-hu) + +%description hu +Hungarian language support for gimp-help. + %package it Summary: Italian (it) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -131,6 +154,14 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-k %description ko Korean language support for gimp-help. +%package lt +Summary: Lithuanian (lt) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-lt) + +%description lt +Lithuanian language support for gimp-help. + %package nl Summary: Dutch (nl) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -147,6 +178,14 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-n %description nn Norwegian Nynorsk language support for gimp-help. +%package pt +Summary: Portuguese (pt) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-pt) + +%description pt +Portuguese language support for gimp-help. + %package pt_BR Summary: Brazilian Portuguese (pt_BR) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -171,6 +210,30 @@ Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-r %description ru Russian language support for gimp-help. +%package sl +Summary: Slovenian (sl) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-sl) + +%description sl +Slovenian language support for gimp-help. + +%package sv +Summary: Swedish (sv) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-sv) + +%description sv +Swedish language support for gimp-help. + +%package uk +Summary: Ukrainian (uk) language support for gimp-help +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: (%{name} = %{?epoch:%{epoch}:}%{version}-%{release} and langpacks-uk) + +%description uk +Ukrainian language support for gimp-help. + %package zh_CN Summary: Simplified Chinese (zh_CN) language support for gimp-help Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -183,13 +246,10 @@ Simplified Chinese language support for gimp-help. %prep %setup -q -%patch 1 -p1 %build %configure -# don't attempt parallel builds, they tend to produce bad output without -# failing -make +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install @@ -199,8 +259,19 @@ f="$PWD/files.list" pushd %{buildroot}%{_datadir}/gimp/%{gimpsubver}/help for lang in *; do + [ "$lang" = "pdf" ] && continue echo "%%lang($lang) %%{_datadir}/gimp/%%{gimpsubver}/help/$lang" > "$f.$lang" done +cd pdf +for pdf in *.pdf; do + l="${pdf%.pdf}" + l="${l#gimp-keys-}" + if [ ! -d "../$l" ]; then + rm -f "$pdf" + else + echo "%%lang($lang) %%{_datadir}/gimp/%%{gimpsubver}/help/$pdf" >> "$f.$lang" + fi +done popd %files @@ -211,21 +282,30 @@ popd # BEGIN: LANGUAGE FILE LISTS %files ca -f files.list.ca +%files cs -f files.list.cs %files da -f files.list.da %files de -f files.list.de %files el -f files.list.el %files en_GB -f files.list.en_GB %files es -f files.list.es +%files fa -f files.list.fa %files fi -f files.list.fi %files fr -f files.list.fr +%files hr -f files.list.hr +%files hu -f files.list.hu %files it -f files.list.it %files ja -f files.list.ja %files ko -f files.list.ko +%files lt -f files.list.lt %files nl -f files.list.nl %files nn -f files.list.nn +%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 uk -f files.list.uk %files zh_CN -f files.list.zh_CN # END: LANGUAGE FILE LISTS diff --git a/sources b/sources index dc4dc00..af0735e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-help-2.10.0.tar.bz2) = 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a +SHA512 (gimp-help-2.10.34.tar.bz2) = 316d558f66c96a0d2d0f17baf700020b76aa221f9e220ddfc3e85b10c82b20b9c1cf36893776a342e90af5170e0102eb743b79663451581444d4f881256cf377 From 5695d241e20ec267493e915cd13ca5dabe46eb60 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sun, 20 Aug 2023 18:34:41 +0200 Subject: [PATCH 13/21] Fix PDF cheat sheet installation path Signed-off-by: Nils Philippsen --- gimp-help.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gimp-help.spec b/gimp-help.spec index 81a7510..863558c 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -269,7 +269,7 @@ for pdf in *.pdf; do if [ ! -d "../$l" ]; then rm -f "$pdf" else - echo "%%lang($lang) %%{_datadir}/gimp/%%{gimpsubver}/help/$pdf" >> "$f.$lang" + echo "%%lang($lang) %%{_datadir}/gimp/%%{gimpsubver}/help/pdf/$pdf" >> "$f.$lang" fi done popd From d81721d4dfe95eea19800555edff314e841ce035 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:19:18 +0000 Subject: [PATCH 14/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d73680394c8cfb6a9c5cfd8d62bcbdfd84f7c90c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:48:15 +0000 Subject: [PATCH 15/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From efd1a893cd0e4c968968c7ba1c1fa867ac28bf73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:20:06 +0000 Subject: [PATCH 16/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1031ef32474522ac5f38eaed7249a11a61c2581f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 21:59:09 +0000 Subject: [PATCH 17/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fca64c8408bafc04d7178343bddc17820de8ee16 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 12 Feb 2025 12:38:41 +0100 Subject: [PATCH 18/21] Update to a 2025-02-12 git snapshot This should fix building with the GIMP 3 release candidates and provide more up to date documentation. Signed-off-by: Nils Philippsen --- .gitignore | 1 + gimp-help.spec | 74 ++++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 82bfe9c..e52bf64 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ 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 863558c..89a786a 100644 --- a/gimp-help.spec +++ b/gimp-help.spec @@ -1,15 +1,40 @@ # NOTE: en/English is in the main package -# 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 +# 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 Summary: Help files for GIMP Name: gimp-help -Version: 2.10.34 +Version: 2.99.0~20250212git2b4f24e36 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 @@ -17,23 +42,29 @@ BuildRequires: gnome-doc-utils BuildRequires: libxml2-python3 BuildRequires: libxslt BuildRequires: pkgconfig >= 0.9.0 -BuildRequires: gimp-devel >= 2:2.10 +BuildRequires: gimp-devel >= 2:3.0.0~RC1 BuildRequires: gettext BuildRequires: graphviz BuildRequires: pngnq BuildRequires: pngcrush BuildRequires: python3 BuildRequires: make -Requires: gimp >= 2:2.10 +Requires: gimp >= 2:3.0.0~RC1 # 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} @@ -178,6 +209,14 @@ 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} @@ -226,6 +265,14 @@ 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} @@ -245,11 +292,13 @@ Simplified Chinese language support for gimp-help. # END: LANGUAGE SUB PACKAGES %prep -%setup -q +%setup -q -n gimp-help-%{plain_version} %build %configure -make %{?_smp_mflags} +# Building gimp-help in parallel is flaky 😬. Do as much as possible in parallel, then attempt to +# fix. +make -k %{?_smp_mflags} || make %install make DESTDIR=%{buildroot} install @@ -277,10 +326,11 @@ popd %files %dir %{_datadir}/gimp/%{gimpsubver}/help %{_datadir}/gimp/%{gimpsubver}/help/en -%doc AUTHORS ChangeLog NEWS README TERMINOLOGY +%doc AUTHORS ChangeLog NEWS README.md 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 @@ -299,12 +349,14 @@ 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 af0735e..80589fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-help-2.10.34.tar.bz2) = 316d558f66c96a0d2d0f17baf700020b76aa221f9e220ddfc3e85b10c82b20b9c1cf36893776a342e90af5170e0102eb743b79663451581444d4f881256cf377 +SHA512 (gimp-help-2.99.0-git2b4f24e36.tar.xz) = 913d0962b07f7e06c894fdcece2bd15ffadddd2765256d6a71e5756cf5df49aa983210e28b12d34e9056adef68231f9af76224f79a3dfc07eea8c17fc8edd5ff From 8cae8cc41af68111b848c5f890b1ceab5dbf1d15 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 20 Mar 2025 13:47:49 +0100 Subject: [PATCH 19/21] 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 20/21] 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 21/21] 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