From e38d8b336e7b0ac6402a49fa9a9081ab334f1e99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:19:58 +0000 Subject: [PATCH 01/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 76427e1..eb440e3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2018-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 9 2019 Pavel Zhukov - 2018-7 - Rebuld with new gnat-rpm-macros - Build with gprbuild 2018 From 0ff9658004589a627f514c1ac48ecb3e28e2010e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:35:39 +0000 Subject: [PATCH 02/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index eb440e3..f95a985 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2018-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2018-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 05dfe226ed116f0bdbd7f88f3ccdb75cf6d4d6b8 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 3 Feb 2020 11:19:25 +0100 Subject: [PATCH 03/69] gcc 10 bootstrap --- xmlada.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index f95a985..42e37f8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ -## %global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch NONE +%global bootstrap_arch %{GPRbuild_arches} +### global bootstrap_arch ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Pavel Zhukov - 2018-10 +- Gcc 10 bootstrap + * Fri Jan 31 2020 Fedora Release Engineering - 2018-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e3c5e6efde62a1599f7470500d1c84e646b68e13 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 3 Feb 2020 11:46:50 +0100 Subject: [PATCH 04/69] rebuild with new gprbuild --- xmlada.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 42e37f8..1a1c312 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ -%global bootstrap_arch %{GPRbuild_arches} -### global bootstrap_arch +### global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 10%{?dist} +Release: 11%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Pavel Zhukov - 2018-11 +- rebuild with new gprbuild + * Mon Feb 3 2020 Pavel Zhukov - 2018-10 - Gcc 10 bootstrap From 2c8c30bb065833fb6f7b98925c2d0aa02771dce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 3 Feb 2020 12:59:38 +0100 Subject: [PATCH 05/69] Upgraded to the 2019 release. Other than the year number, the only change is an adaptation to an incompatible API change in GNAT.Sockets. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 95ed331..98b31f9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xmlada-gpl-2016-src.tar.gz /xmlada-gpl-2017-src.tar.gz /xmlada-gpl-2018-20180524-src.tar.gz +/xmlada-2019-20190429-19B9D-src.tar.gz diff --git a/sources b/sources index ff845e1..e00e549 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-gpl-2018-20180524-src.tar.gz) = 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 +SHA512 (xmlada-2019-20190429-19B9D-src.tar.gz) = f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 diff --git a/xmlada.spec b/xmlada.spec index 1a1c312..a7623d7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -5,14 +5,14 @@ ## gcc-gnat package Name: xmlada -Version: 2018 -Release: 11%{?dist} +Version: 2019 +Release: 1%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-2018-20180524-src.tar.gz +Source0: xmlada-2019-20190429-19B9D-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch @@ -68,7 +68,7 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-gpl-%{version}-src +%setup -q -n xmlada-2019-20190429-19B9D-src %build %ifnarch %{bootstrap_arch} @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Björn Persson - 2019-1 +- Upgraded to the 2019 release. + * Mon Feb 3 2020 Pavel Zhukov - 2018-11 - rebuild with new gprbuild From 316680df6a31772bfde712c66ef76f104ce8ecf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 3 Feb 2020 13:04:56 +0100 Subject: [PATCH 06/69] A macro must have a value. --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a7623d7..7d413ff 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,5 +1,5 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch +%global bootstrap_arch not_bootstrapping ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package From 4373ed3b71ebb9f4d3b29bc73d3cb08ab080e0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:49:53 +0000 Subject: [PATCH 07/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 7d413ff..a3a2047 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2019 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2019-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Feb 3 2020 Björn Persson - 2019-1 - Upgraded to the 2019 release. From 6d0219d448c913b52b85f48cec86a82e351ddffe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:45:38 +0000 Subject: [PATCH 08/69] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a3a2047..2c011f5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2019 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,10 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2019-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2019-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2598b3670fbd40500e643b6a31bc286a25de0d78 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 7 Dec 2020 11:56:16 -0700 Subject: [PATCH 09/69] - Gcc 11 bootstrap --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 2c011f5..77f0a13 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch not_bootstrapping +%global bootstrap_arch %{GPRbuild_arches} ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2019 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Dec 07 2020 Jeff Law - 2019-4 +- Gcc 11 bootstrap + * Sat Aug 01 2020 Fedora Release Engineering - 2019-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fbe6082387ab8a0d9e05794d1ede1f8449f36d3f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 8 Dec 2020 08:19:06 +0100 Subject: [PATCH 10/69] Update to 2020. Rebuild with new gprbuild --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 98b31f9..0390bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xmlada-gpl-2017-src.tar.gz /xmlada-gpl-2018-20180524-src.tar.gz /xmlada-2019-20190429-19B9D-src.tar.gz +/xmlada-2020-20200429-19A99-src.tar.gz diff --git a/sources b/sources index e00e549..5defdf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-2019-20190429-19B9D-src.tar.gz) = f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 +SHA512 (xmlada-2020-20200429-19A99-src.tar.gz) = e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c diff --git a/xmlada.spec b/xmlada.spec index 77f0a13..c6e9607 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -5,14 +5,14 @@ ## gcc-gnat package Name: xmlada -Version: 2019 -Release: 4%{?dist} +Version: 2020 +Release: 1%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-2019-20190429-19B9D-src.tar.gz +Source0: xmlada-2020-20200429-19A99-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch @@ -68,7 +68,7 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-2019-20190429-19B9D-src +%setup -q -n xmlada-2020-20200429-19A99-src %build %ifnarch %{bootstrap_arch} @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Dec 8 2020 Pavel Zhukov - 2020-1 +- New version v2020 + * Mon Dec 07 2020 Jeff Law - 2019-4 - Gcc 11 bootstrap From 57f3e0d6e30c9283e02993304a12154954fba917 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 8 Dec 2020 08:51:59 +0100 Subject: [PATCH 11/69] Disable gprbuild's bootstrapping --- xmlada.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index c6e9607..8dc8314 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,13 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch no_bootstraping + ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2020 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +163,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Dec 8 2020 Pavel Zhukov - 2020-2 +- Disable gprbuild's bootstraping + * Tue Dec 8 2020 Pavel Zhukov - 2020-1 - New version v2020 From 0ec7b710332eef345b106dd675870a8f43890b14 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 21 Dec 2020 08:55:22 +0100 Subject: [PATCH 12/69] Rebuild. Ali invalidated by gcc update --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 8dc8314..2256eca 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -163,6 +163,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Dec 21 2020 Pavel Zhukov - 2020-3 +- Rebuild. Ali files invalidated by gcc update + * Tue Dec 8 2020 Pavel Zhukov - 2020-2 - Disable gprbuild's bootstraping From 4ba9dd15ad7d656a420ebaacb92db90a645cb84a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:51:33 +0000 Subject: [PATCH 13/69] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlada.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlada.spec b/xmlada.spec index 2256eca..a4f055f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -19,6 +19,7 @@ Patch2: %{name}-2016-gprinstall.patch +BuildRequires: make %ifnarch %{bootstrap_arch} BuildRequires: gprbuild > 2018-10 BuildRequires: gcc-gnat From 453aa8e501031df2b208051c2857b525212e9411 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:09:16 +0000 Subject: [PATCH 14/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a4f055f..7da01bc 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -164,6 +164,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2020-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Pavel Zhukov - 2020-3 - Rebuild. Ali files invalidated by gcc update From 6b4e8226ae31876282497d0487dcc58375de83c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 10 Jul 2021 18:47:55 +0200 Subject: [PATCH 15/69] Removed the explicit check-rpaths invocation as that is done automatically now. --- xmlada.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 7da01bc..8c13c94 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -119,11 +119,6 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif -%check -## Verify that there are no runpaths in the compiled libraries. -%{_rpmconfigdir}/check-rpaths - - %files %license COPYING* %doc README.md TODO AUTHORS From 4e49beaa56d05722261d0e1c8015229a239f7288 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:42:40 +0000 Subject: [PATCH 16/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 8c13c94..6da348a 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2020-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2020-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 32743f612e9b0294c38d7d9336bedd934db0df02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 16 Jan 2022 19:38:19 +0100 Subject: [PATCH 17/69] Rebuilt with GCC 12 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 6da348a..36645e6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sun Jan 16 2022 Björn Persson - 2020-6 +- Rebuilt with GCC 12 prerelease. + * Fri Jul 23 2021 Fedora Release Engineering - 2020-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e8387d453aeec060e37d3d8610653fdec3f9235d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:15:10 +0000 Subject: [PATCH 18/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 36645e6..d95800c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2020-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jan 16 2022 Björn Persson - 2020-6 - Rebuilt with GCC 12 prerelease. From 40f5be73c82cedf1e47f1c24f48e7a090e35e03b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:17:04 +0000 Subject: [PATCH 19/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index d95800c..ae5c05f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2020-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2020-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6ea8b9a57537ba7f91db255b5218f61610460aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 17 Jan 2023 16:10:21 +0100 Subject: [PATCH 20/69] Rebuilt with GCC 13. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index ae5c05f..4e42cfe 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Jan 17 2023 Björn Persson - 2020-9 +- Rebuilt with GCC 13. + * Sat Jul 23 2022 Fedora Release Engineering - 2020-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 829b43068b9fea13837fa6b2c137b1da4ba3c435 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:37:16 +0000 Subject: [PATCH 21/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 4e42cfe..3e832c9 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2020-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Björn Persson - 2020-9 - Rebuilt with GCC 13. From b3fe68424ef69d8f90c8e679bf42f848b243ecb2 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 4 Oct 2022 19:37:36 +0200 Subject: [PATCH 22/69] Update to v22.0.0, update the epoch. --- .gitignore | 1 + sources | 2 +- xmlada-gprinstall-relocate-artifacts.patch | 34 +++++ xmlada.spec | 138 +++++++++++++-------- 4 files changed, 119 insertions(+), 56 deletions(-) create mode 100644 xmlada-gprinstall-relocate-artifacts.patch diff --git a/.gitignore b/.gitignore index 0390bb6..5784613 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xmlada-gpl-2018-20180524-src.tar.gz /xmlada-2019-20190429-19B9D-src.tar.gz /xmlada-2020-20200429-19A99-src.tar.gz +/xmlada-22.0.0.tar.gz diff --git a/sources b/sources index 5defdf1..c48183b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-2020-20200429-19A99-src.tar.gz) = e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c +SHA512 (xmlada-22.0.0.tar.gz) = 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e \ No newline at end of file diff --git a/xmlada-gprinstall-relocate-artifacts.patch b/xmlada-gprinstall-relocate-artifacts.patch new file mode 100644 index 0000000..e929ef1 --- /dev/null +++ b/xmlada-gprinstall-relocate-artifacts.patch @@ -0,0 +1,34 @@ +--- a/input_sources/xmlada_input.gpr ++++ b/input_sources/xmlada_input.gpr +@@ -39,13 +39,24 @@ + package Ide renames XmlAda_Shared.Ide; + + package Install is +- for Artifacts ("share/doc/xmlada") +- use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); +- for Artifacts ("share/gpr") use ("../distrib/xmlada.gpr"); +- for Artifacts ("share/examples/xmlada/dom") use ("../docs/dom/*"); +- for Artifacts ("share/examples/xmlada/sax") use ("../docs/sax/*"); +- for Artifacts ("share/examples/xmlada/schema") use ("../docs/schema/*"); +- for Artifacts ("share/examples/xmlada/cross") use ("../docs/cross/*"); ++ ++ for Artifacts ("share/doc/xmlada/html/") ++ use ("../docs/_build/html/**"); ++ for Artifacts ("share/doc/xmlada/pdf/") ++ use ("../docs/_build/latex/XMLAda.pdf"); ++ ++ for Artifacts ("share/gpr/") ++ use ("../distrib/xmlada.gpr"); ++ ++ for Artifacts ("share/doc/xmlada/examples/dom/") ++ use ("../docs/dom/*"); ++ for Artifacts ("share/doc/xmlada/examples/sax/") ++ use ("../docs/sax/*"); ++ for Artifacts ("share/doc/xmlada/examples/schema/") ++ use ("../docs/schema/*"); ++ for Artifacts ("share/doc/xmlada/examples/cross/") ++ use ("../docs/cross/*"); ++ + end Install; + + end XmlAda_Input; diff --git a/xmlada.spec b/xmlada.spec index 3e832c9..211d641 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,31 +1,40 @@ -### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch no_bootstraping +# Set this variable to %GPRbuild_arches for bootstrapping of +# gprbuild on new architecture or in case of new major version of +# the gcc-gnat package. +%global bootstrap_arch no_bootstrapping +#global bootstrap_arch %GPRbuild_arches -## Set this variable to %{GPRbuild_arches} for bootraping of -## gprbuild on new architecture or in case of new magor verion of -## gcc-gnat package +# Upstream source information. +%global upstream_owner AdaCore +%global upstream_name xmlada +%global upstream_version 22.0.0 +%global upstream_gittag v%{upstream_version} Name: xmlada -Version: 2020 -Release: 10%{?dist} +Epoch: 2 +Version: %{upstream_version} +Release: 1%{?dist} Summary: XML library for Ada -License: GPLv3+ -URL: http://libre.adacore.com -## Direct download link is unavailable -## http://libre.adacore.com/libre/download/ -Source0: xmlada-2020-20200429-19A99-src.tar.gz -## Fedora-specific -Patch2: %{name}-2016-gprinstall.patch +License: GPLv3+ with exceptions +URL: https://github.com/%{upstream_owner}/%{upstream_name} +Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz -BuildRequires: make +# [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. +Patch: %{name}-gprinstall-relocate-artifacts.patch + +BuildRequires: make %ifnarch %{bootstrap_arch} BuildRequires: gprbuild > 2018-10 BuildRequires: gcc-gnat -BuildRequires: fedora-gnat-project-common >= 2 +BuildRequires: fedora-gnat-project-common +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx-latex +BuildRequires: latexmk %endif +# Build only on architectures where GPRbuild is available. ExclusiveArch: %{GPRbuild_arches} @@ -36,10 +45,11 @@ and an almost complete support for the core part of the DOM. It includes support for validating XML files with XML schemas. %ifnarch %{bootstrap_arch} + %package devel Summary: XML library for Ada devel package -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: fedora-gnat-project-common >= 2 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: fedora-gnat-project-common %description devel Xml library for ada devel package. @@ -47,7 +57,7 @@ Xml library for ada devel package. %package static Summary: XML library for Ada, static libraries -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} %description static This package contains the XML/Ada libraries for static linking. It is needed @@ -59,6 +69,8 @@ possible. %else +# When bootstrapping gprbuild, only a package that contains source code is +# produced, so a debug package is not needed. %global debug_package %{nil} %package sources @@ -70,24 +82,39 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-2020-20200429-19A99-src +%autosetup -p1 + +# Set version number. +sed --in-place --expression 's/18.0w/%{version}/' configure configure.in %build %ifnarch %{bootstrap_arch} -%configure --disable-rpath --enable-shared --disable-static --enable-build=distrib -make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} +%configure --enable-build=distrib --enable-shared + +# Build the libraries. +%{make_build} shared static GPROPTS='%{GPRbuild_flags}' + +# Make the documentation. +make -C docs html latexpdf + %else -%configure --enable-static --enable-build=distrib +%{configure} --enable-build=distrib + %endif %install %ifnarch %{bootstrap_arch} -###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" -export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" -## Install the shared libraries first and then the static ones, because -## apparently the variant that gprinstall sees first becomes the default in the -## project files. -make install-relocatable install-static prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" + +export GPRINSTALL_OPTS="--no-manifest \ + --ali-subdir=%{buildroot}%{_libdir} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir}" + +# Install the shared libraries first and then the static ones, because +# apparently the variant that gprinstall sees first becomes the default in the +# project files. +make install-relocatable install-static \ + prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; @@ -99,29 +126,21 @@ install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ ## To enable GPS plugin delete this string and create subpackage rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* -## These Sphinx-generated files aren't needed in the package: -rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} -mkdir -p %{buildroot}/%{_datarootdir}/%{name} -mv %{buildroot}/%{_datarootdir}/examples %{buildroot}/%{_datarootdir}/%{name} -## GPRinstall's manifest files are architecture-specific because they contain -## what seems to be checksums of architecture-specific files, so they must not -## be under _datadir. Their function is apparently undocumented, but my crystal -## ball tells me that they're used when GPRinstall uninstalls or upgrades -## packages. The manifest file is therefore irrelevant in this RPM package, so -## delete it. -rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %else -mkdir -p %{buildroot}/%{_includedir}/%{name}/sources -cp -r . %{buildroot}/%{_includedir}/%{name}/sources -find %{buildroot}/%{_includedir}/%{name}/sources -type f ! -name "*ad[sb]" ! -name "*gpr" -delete -find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete + +# Copy the source files. +mkdir --parents %{buildroot}%{_includedir}/%{name}/sources +cp -r . %{buildroot}%{_includedir}/%{name}/sources +find %{buildroot}%{_includedir}/%{name}/sources -type f ! -name "*ad[sb]" ! -name "*gpr" -delete +find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete + %endif %files -%license COPYING* -%doc README.md TODO AUTHORS +%license COPYING3 COPYING.RUNTIME +%doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static @@ -133,32 +152,41 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %{_libdir}/%{name}/lib%{name}*.so.* %endif - - %ifnarch %{bootstrap_arch} + %files devel %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so -%{_pkgdocdir}/*.html -%{_pkgdocdir}/searchindex.js -%{_pkgdocdir}/_sources -%{_pkgdocdir}/_static -%{_pkgdocdir}/XMLAda.pdf -%{_datarootdir}/%{name} - +%dir %{_pkgdocdir} +%{_pkgdocdir}/html +%{_pkgdocdir}/pdf +%{_pkgdocdir}/examples +# Exclude Sphinx-generated files that aren't needed in the package. +%exclude %{_pkgdocdir}/html/.buildinfo +%exclude %{_pkgdocdir}/html/objects.inv %files static %{_libdir}/%{name}/*.a %else + %files sources %{_includedir}/%{name} + %endif %changelog +* Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 +- Updated to v22.0.0, using the archive available on GitHub. +- Changed the epoch to mark the new upstream version scheme. +- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll packages. +- Updated the license, a runtime exception has now been added. +- Added new build dependencies to build the documentation with Sphinx and LaTeX. +- Examples are now located in _pkgdocdir/examples. + * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eacca052b981fd342c422a1b93fe6a24f6e517b6 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 4 Oct 2022 19:38:26 +0200 Subject: [PATCH 23/69] Change to SPDX license expressions, add Unicode license. --- xmlada.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 211d641..8ef5a3c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -15,8 +15,11 @@ Epoch: 2 Version: %{upstream_version} Release: 1%{?dist} Summary: XML library for Ada -License: GPLv3+ with exceptions +License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 +# XML/Ada itself is licensed under GPL v3 or later with a runtime exception. The +# Unicode license is mentioned as Unicode data files were used as an input for +# generating some of XML/Ada's source code. URL: https://github.com/%{upstream_owner}/%{upstream_name} Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz @@ -186,6 +189,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated the license, a runtime exception has now been added. - Added new build dependencies to build the documentation with Sphinx and LaTeX. - Examples are now located in _pkgdocdir/examples. +- License field now contains an SPDX license expression. +- Added the Unicode license to cover all code that has been generated using Unicode data. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 841f543788793aa9528825a15c9b7c7815f15c82 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 22 Sep 2022 21:48:04 +0200 Subject: [PATCH 24/69] Remove patches that do no longer apply and/or are no longer used. Removed: - xmlada-2016-gprinstall.patch --- xmlada-2016-gprinstall.patch | 63 ------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 xmlada-2016-gprinstall.patch diff --git a/xmlada-2016-gprinstall.patch b/xmlada-2016-gprinstall.patch deleted file mode 100644 index e134248..0000000 --- a/xmlada-2016-gprinstall.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/unicode/xmlada_unicode.gpr b/unicode/xmlada_unicode.gpr -index 8a5a2ac..290cfe6 100644 ---- a/unicode/xmlada_unicode.gpr -+++ b/unicode/xmlada_unicode.gpr -@@ -37,4 +37,8 @@ project XmlAda_Unicode is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Unicode; -diff --git a/dom/xmlada_dom.gpr b/dom/xmlada_dom.gpr -index 5c156ab..f6d37f6 100644 ---- a/dom/xmlada_dom.gpr -+++ b/dom/xmlada_dom.gpr -@@ -39,4 +39,7 @@ project XmlAda_Dom is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; - end XmlAda_Dom; -diff --git a/input_sources/xmlada_input.gpr b/input_sources/xmlada_input.gpr -index 7602590..329bdad 100644 ---- a/input_sources/xmlada_input.gpr -+++ b/input_sources/xmlada_input.gpr -@@ -39,6 +39,7 @@ project XmlAda_Input is - package Ide renames Shared.Ide; - - package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; - for Artifacts ("share/doc/xmlada") - use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); - for Artifacts ("lib/gnat") use ("../distrib/xmlada.gpr"); -diff --git a/sax/xmlada_sax.gpr b/sax/xmlada_sax.gpr -index f4d74ac..c146d79 100644 ---- a/sax/xmlada_sax.gpr -+++ b/sax/xmlada_sax.gpr -@@ -39,4 +39,8 @@ project XmlAda_Sax is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Sax; -diff --git a/schema/xmlada_schema.gpr b/schema/xmlada_schema.gpr -index 4688847..62dee2f 100644 ---- a/schema/xmlada_schema.gpr -+++ b/schema/xmlada_schema.gpr -@@ -40,4 +40,8 @@ project XmlAda_Schema is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Schema; From c3763f02523b53ff0b9defb0429cf109c2d81025 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 21:38:45 +0200 Subject: [PATCH 25/69] Remove some post-install steps that are no longer required. The `xmlada-config` script and GNATstudio plugin are no longer installed and do not have to be removed. --- xmlada.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 8ef5a3c..5340202 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -122,12 +122,8 @@ make install-relocatable install-static \ ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; -## Delete old bash script (not needed now) -rm -f %{buildroot}%{_bindir}/xmlada-config + install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ -## There is not GNAT programming studio in Fedora -## To enable GPS plugin delete this string and create subpackage -rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* %else @@ -191,6 +187,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Examples are now located in _pkgdocdir/examples. - License field now contains an SPDX license expression. - Added the Unicode license to cover all code that has been generated using Unicode data. +- Removed some post-install steps that are no longer required. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3a00b5b5e84837805c5f3aad1a7f6d9fab44fae5 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 23:17:16 +0200 Subject: [PATCH 26/69] Build static libraries position independent (PIC). This will allow executables that will link with these libraries to be build position independent (PIE). --- xmlada.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5340202..89ca638 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -95,7 +95,7 @@ sed --in-place --expression 's/18.0w/%{version}/' configure configure.in %configure --enable-build=distrib --enable-shared # Build the libraries. -%{make_build} shared static GPROPTS='%{GPRbuild_flags}' +%{make_build} shared static-pic GPROPTS='%{GPRbuild_flags}' # Make the documentation. make -C docs html latexpdf @@ -116,7 +116,7 @@ export GPRINSTALL_OPTS="--no-manifest \ # Install the shared libraries first and then the static ones, because # apparently the variant that gprinstall sees first becomes the default in the # project files. -make install-relocatable install-static \ +make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" ## Revoke exec permissions @@ -188,6 +188,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - License field now contains an SPDX license expression. - Added the Unicode license to cover all code that has been generated using Unicode data. - Removed some post-install steps that are no longer required. +- Static libraries are now build position independent (PIC). * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ba3cdacac955d7c9397a64e04d2274790b1b3009 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 19:14:52 +0200 Subject: [PATCH 27/69] Fix permission errors in the prep step. Fix source packaging (like permissions) in the prep. section, before the build. These errors are similar to the errors that would be fixed by patches. --- xmlada.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 89ca638..bb47cf1 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -87,6 +87,10 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %prep %autosetup -p1 +# Revoke bogus exec permissions. +find . -name '*.gpr' -exec chmod -x {} \; +find docs -type f -exec chmod -x {} \; + # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -119,10 +123,6 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" -## Revoke exec permissions -find %{buildroot} -name '*.gpr' -exec chmod -x {} \; -find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; - install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ rm -f %{buildroot}/%{_libdir}/%{name}/static/* @@ -189,6 +189,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Added the Unicode license to cover all code that has been generated using Unicode data. - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). +- Fix permission errors in the prep step; these are source packaging errors. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5bd98586027a08fd6c20f67dab324fb9dd08b70a Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 22:07:16 +0200 Subject: [PATCH 28/69] Update package summaries and descriptions. --- xmlada.spec | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index bb47cf1..7da50f7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -41,28 +41,33 @@ BuildRequires: latexmk ExclusiveArch: %{GPRbuild_arches} -%description -XML/Ada includes support for parsing XML files, including DTDs, -full support for SAX, -and an almost complete support for the core part of the DOM. -It includes support for validating XML files with XML schemas. +%global common_description_en \ +XML/Ada includes support for parsing XML files, including DTDs, full support for \ +SAX, and an almost complete support for the core part of the DOM. It includes \ +support for validating XML files with XML schemas. + +%description %{common_description_en} + %ifnarch %{bootstrap_arch} %package devel -Summary: XML library for Ada devel package +Summary: Development files for the XML/Ada library Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: fedora-gnat-project-common -%description devel -Xml library for ada devel package. +%description devel %{common_description_en} + +This package contains source code and linking information for developing +applications that use the XML/Ada library. %package static -Summary: XML library for Ada, static libraries +Summary: Static libraries of XML/Ada Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} -%description static +%description static %{common_description_en} + This package contains the XML/Ada libraries for static linking. It is needed for linking GPRbuild statically so that GPRbuild will remain functional when libraries are upgraded. @@ -77,10 +82,12 @@ possible. %global debug_package %{nil} %package sources -Summary: Source of XMLada for bootstrapping +Summary: Sources of the XML/Ada library (for bootstrapping GPRbuild) -%description sources -On architectures without gprbuild installs sources for gprbuild's bootstrap +%description sources %{common_description_en} + +This package contains source code for bootstrapping GPRbuild on architectures +on which GPRbuild is not yet available. %endif @@ -190,6 +197,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. +- Updated some summaries and descriptions. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ff45d19520de60f808d6b0ae0c82088c1f2260bf Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 24 Sep 2022 13:42:09 +0200 Subject: [PATCH 29/69] Improve spec file readability. --- xmlada.spec | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 7da50f7..86d9a66 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -49,6 +49,10 @@ support for validating XML files with XML schemas. %description %{common_description_en} +################# +## Subpackages ## +################# + %ifnarch %{bootstrap_arch} %package devel @@ -91,6 +95,11 @@ on which GPRbuild is not yet available. %endif + +############# +## Prepare ## +############# + %prep %autosetup -p1 @@ -101,6 +110,11 @@ find docs -type f -exec chmod -x {} \; # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in + +########### +## Build ## +########### + %build %ifnarch %{bootstrap_arch} %configure --enable-build=distrib --enable-shared @@ -116,6 +130,11 @@ make -C docs html latexpdf %endif + +############# +## Install ## +############# + %install %ifnarch %{bootstrap_arch} @@ -144,6 +163,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %endif +########### +## Files ## +########### + %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS @@ -184,6 +207,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %endif + +############### +## Changelog ## +############### + %changelog * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. @@ -198,6 +226,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. - Updated some summaries and descriptions. +- Improved spec file readability. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f0f6f19dc6e591672bf394c9d0379d697ceb77cb Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 22 Oct 2022 01:40:35 +0200 Subject: [PATCH 30/69] Fix whitespace issues. --- xmlada.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 86d9a66..b0be708 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -366,7 +366,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete * Sun Mar 15 2015 Pavel Zhukov - 2013-10 - Create unversioned symlinks - + * Sat Feb 14 2015 Pavel Zhukov - 2013-9 - Rebuild with new gcc 4.9 @@ -383,7 +383,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - aarch64 now has Ada * Sun Apr 20 2014 Pavel Zhukov - 2013-4 -- Rebuild for new gcc +- Rebuild for new gcc * Sun Aug 04 2013 Fedora Release Engineering - 2013-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 94b0038caea5db46c0c7e98e260307f20439d3e2 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 23:41:02 +0200 Subject: [PATCH 31/69] Mark the source package as architecture independent. --- xmlada.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index b0be708..9c3342f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -87,6 +87,7 @@ possible. %package sources Summary: Sources of the XML/Ada library (for bootstrapping GPRbuild) +BuildArch: noarch %description sources %{common_description_en} @@ -227,6 +228,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Fix permission errors in the prep step; these are source packaging errors. - Updated some summaries and descriptions. - Improved spec file readability. +- Marked the source package as architecture independent. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1b16adc0b82174637c5e1f40ca1112088d01e0e7 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:01:17 +0200 Subject: [PATCH 32/69] Remove empty directory _libdir/static; it seems to have no purpose. --- xmlada.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 9c3342f..3bbc14d 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -150,9 +150,6 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" -install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ -rm -f %{buildroot}/%{_libdir}/%{name}/static/* - %else # Copy the source files. @@ -173,7 +170,6 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* %{_libdir}/lib%{name}_input_sources.so.* %{_libdir}/lib%{name}_schema.so.* @@ -229,6 +225,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated some summaries and descriptions. - Improved spec file readability. - Marked the source package as architecture independent. +- Removed empty directory '_libdir/static'; it seems to have no purpose. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c0565fde4b9f8d0ea578cb6e827f7667ccab3382 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:27:38 +0200 Subject: [PATCH 33/69] Move libraries, fixup the symlinks for the shared libraries. --- xmlada.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 3bbc14d..e83fdce 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -150,6 +150,18 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" +# Remove all symbolic links in libdir/ and move the libraries from +# libdir/xmlada to libdir/ itself. +rm %{buildroot}%{_libdir}/*.so* +mv %{buildroot}%{_libdir}/%{name}/*.so* %{buildroot}%{_libdir} +mv %{buildroot}%{_libdir}/%{name}/*.a %{buildroot}%{_libdir} + +# Fix up the symbolic links for the shared libraries. +for component in dom input_sources schema unicode sax ; do + ln --symbolic --force lib%{name}_${component}.so.%{version} \ + %{buildroot}%{_libdir}/lib%{name}_${component}.so +done + %else # Copy the source files. @@ -169,13 +181,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} -%dir %{_libdir}/%{name} -%{_libdir}/lib%{name}_dom.so.* -%{_libdir}/lib%{name}_input_sources.so.* -%{_libdir}/lib%{name}_schema.so.* -%{_libdir}/lib%{name}_unicode.so.* -%{_libdir}/lib%{name}_sax.so.* -%{_libdir}/%{name}/lib%{name}*.so.* +%{_libdir}/lib%{name}_dom.so.%{version} +%{_libdir}/lib%{name}_input_sources.so.%{version} +%{_libdir}/lib%{name}_schema.so.%{version} +%{_libdir}/lib%{name}_unicode.so.%{version} +%{_libdir}/lib%{name}_sax.so.%{version} %endif %ifnarch %{bootstrap_arch} @@ -183,8 +193,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files devel %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr +%dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali -%{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so %dir %{_pkgdocdir} %{_pkgdocdir}/html @@ -195,7 +205,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %exclude %{_pkgdocdir}/html/objects.inv %files static -%{_libdir}/%{name}/*.a +%{_libdir}/lib%{name}*.a %else @@ -226,6 +236,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Improved spec file readability. - Marked the source package as architecture independent. - Removed empty directory '_libdir/static'; it seems to have no purpose. +- Moved all libraries from '_libdir/xmlada' to '_libdir'. +- Fix up the symbolic links for the shared libraries. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From da3f6003c0f828d0460444a7d419f8eca717535d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 25 Sep 2022 10:56:12 +0200 Subject: [PATCH 34/69] Only produce an xmlada-sources package when bootstrapping. --- xmlada.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index e83fdce..2f4a075 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -177,18 +177,16 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ## Files ## ########### +%ifnarch %{bootstrap_arch} + %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS -%ifnarch %{bootstrap_arch} %{_libdir}/lib%{name}_dom.so.%{version} %{_libdir}/lib%{name}_input_sources.so.%{version} %{_libdir}/lib%{name}_schema.so.%{version} %{_libdir}/lib%{name}_unicode.so.%{version} %{_libdir}/lib%{name}_sax.so.%{version} -%endif - -%ifnarch %{bootstrap_arch} %files devel %{_includedir}/%{name} From 6ad095e706ac94935e60bf6230d0740e738a1cc5 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:40:31 +0200 Subject: [PATCH 35/69] Move documentation and examples into a separate package. --- xmlada.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 2f4a075..4a30c75 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -59,6 +59,7 @@ support for validating XML files with XML schemas. Summary: Development files for the XML/Ada library Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: fedora-gnat-project-common +Recommends: %{name}-doc %description devel %{common_description_en} @@ -79,6 +80,19 @@ libraries are upgraded. Other Fedora packages shall require xmlada-devel rather than xmlada-static if possible. + +%package doc +Summary: Documentation for the XML/Ada library +BuildArch: noarch +License: AdaCore-doc AND MIT AND BSD-2-Clause +# License for the documentation is AdaCore-doc. The Javascript and CSS files +# that Sphinx includes with the documentation are BSD 2-Clause and MIT-licensed. + +%description doc %{common_description_en} + +This package contains the documentation in HTML and PDF, and some examples. + + %else # When bootstrapping gprbuild, only a package that contains source code is @@ -194,6 +208,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/lib%{name}*.so + +%files static +%{_libdir}/lib%{name}*.a + +%files doc %dir %{_pkgdocdir} %{_pkgdocdir}/html %{_pkgdocdir}/pdf @@ -202,9 +221,6 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %exclude %{_pkgdocdir}/html/.buildinfo %exclude %{_pkgdocdir}/html/objects.inv -%files static -%{_libdir}/lib%{name}*.a - %else %files sources @@ -236,6 +252,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Removed empty directory '_libdir/static'; it seems to have no purpose. - Moved all libraries from '_libdir/xmlada' to '_libdir'. - Fix up the symbolic links for the shared libraries. +- Moved documentation and examples into a separate package. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9f12d033499b37dade7364ca62c8a33a84ae997d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 27 Dec 2022 16:42:36 +0100 Subject: [PATCH 36/69] Install each component separately. --- xmlada.gpr | 9 ++++++++ xmlada.spec | 59 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 xmlada.gpr diff --git a/xmlada.gpr b/xmlada.gpr new file mode 100644 index 0000000..b755c81 --- /dev/null +++ b/xmlada.gpr @@ -0,0 +1,9 @@ +with "xmlada_unicode"; +with "xmlada_sax"; +with "xmlada_input"; +with "xmlada_dom"; +with "xmlada_schema"; + +project Xmlada is + for Source_Dirs use (); +end Xmlada; diff --git a/xmlada.spec b/xmlada.spec index 4a30c75..5e376a6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -24,6 +24,11 @@ License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 URL: https://github.com/%{upstream_owner}/%{upstream_name} Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz +# XML/Ada's aggregate project file. This project file is normally generated and +# installed by GPRinstall, but as we'll install each XML/Ada component +# separately, we need to maintain and install it manually. +Source1: xmlada.gpr + # [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. Patch: %{name}-gprinstall-relocate-artifacts.patch @@ -153,22 +158,40 @@ make -C docs html latexpdf %install %ifnarch %{bootstrap_arch} -export GPRINSTALL_OPTS="--no-manifest \ - --ali-subdir=%{buildroot}%{_libdir} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir}" +# Install each component. +for libtype in relocatable static-pic ; do -# Install the shared libraries first and then the static ones, because -# apparently the variant that gprinstall sees first becomes the default in the -# project files. -make install-relocatable install-static-pic \ - prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" + for component in dom schema unicode sax ; do + gprinstall --create-missing-dirs --no-manifest \ + --prefix=%{buildroot}%{_prefix} \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component} \ + --project-subdir=%{buildroot}%{_GNAT_project_dir} \ + --ali-subdir=%{buildroot}%{_libdir}/%{name} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir} \ + --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ + --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ + -P ${component}/%{name}_${component}.gpr + done -# Remove all symbolic links in libdir/ and move the libraries from -# libdir/xmlada to libdir/ itself. -rm %{buildroot}%{_libdir}/*.so* -mv %{buildroot}%{_libdir}/%{name}/*.so* %{buildroot}%{_libdir} -mv %{buildroot}%{_libdir}/%{name}/*.a %{buildroot}%{_libdir} + # The "input" component needs special treatment as its dirname in the source + # tree ("input_sources") is not reflected in its GNAT project file + # ("xmlada_input.gpr"). + gprinstall --create-missing-dirs --no-manifest \ + --prefix=%{buildroot}%{_prefix} \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/input \ + --project-subdir=%{buildroot}%{_GNAT_project_dir} \ + --ali-subdir=%{buildroot}%{_libdir}/%{name} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir} \ + --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ + --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ + -P input_sources/%{name}_input.gpr +done + +# Install the aggregate project file ("xmlada.gpr"). +install --mode=u=rw,go=r,a-s --preserve-timestamps \ + %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} # Fix up the symbolic links for the shared libraries. for component in dom input_sources schema unicode sax ; do @@ -196,15 +219,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS -%{_libdir}/lib%{name}_dom.so.%{version} -%{_libdir}/lib%{name}_input_sources.so.%{version} -%{_libdir}/lib%{name}_schema.so.%{version} -%{_libdir}/lib%{name}_unicode.so.%{version} -%{_libdir}/lib%{name}_sax.so.%{version} +%{_libdir}/lib%{name}*.so.%{version} %files devel -%{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr +%{_includedir}/%{name} %dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/lib%{name}*.so From 140894df287a84334819bc254067233fb3c87aff Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 4 Mar 2023 13:56:12 +0100 Subject: [PATCH 37/69] Verify ALI files before installation. --- xmlada.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 5e376a6..d28faaf 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -158,6 +158,16 @@ make -C docs html latexpdf %install %ifnarch %{bootstrap_arch} +# Verify that the ALI files of both builds (relocatable and static-pic) match. +# The verfication is necessary as GPRinstall will overwrite the ALI files during +# the installation of the static-pic build (which is installed after the +# relocatable build). +for component_dir in dom schema unicode sax input_sources ; do + diff --exclude "*.a" --exclude "*.so*" --exclude ".cvsignore" \ + %{_builddir}/%{name}-%{version}/${component_dir}/lib/relocatable \ + %{_builddir}/%{name}-%{version}/${component_dir}/lib/static-pic +done + # Install each component. for libtype in relocatable static-pic ; do From 51d09c109e6f8679dc4efa8ba92a72ba95add89d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:58:47 +0200 Subject: [PATCH 38/69] Make the generated project files architecture-independent. --- xmlada.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index d28faaf..80977d4 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -34,8 +34,7 @@ Patch: %{name}-gprinstall-relocate-artifacts.patch BuildRequires: make %ifnarch %{bootstrap_arch} -BuildRequires: gprbuild > 2018-10 -BuildRequires: gcc-gnat +BuildRequires: gcc-gnat gprbuild sed BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex @@ -209,6 +208,26 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done +# Make the generated project files architecture-independent. +for component in dom input schema unicode sax ; do + sed --regexp-extended --in-place \ + '--expression=1i with "directories";' \ + '--expression=/^-- This project has been generated/d' \ + '--expression=s|^( *for +Source_Dirs +use +).*;$|\1(Directories.Includedir \& "/'%{name}/${component}'");|i' \ + '--expression=s|^( *for +Library_Dir +use +).*;$|\1Directories.Libdir;|i' \ + '--expression=s|^( *for +Library_ALI_Dir +use +).*;$|\1Directories.Libdir \& "/'%{name}'";|i' \ + %{buildroot}%{_GNAT_project_dir}/%{name}_${component}.gpr + # The Sed commands are: + # 1: Insert a with clause before the first line to import the directories + # project. + # 2: Delete a comment that mentions the architecture. + # 3: Replace the value of Source_Dirs with a pathname based on + # Directories.Includedir. + # 4: Replace the value of Library_Dir with Directories.Libdir. + # 5: Replace the value of Library_ALI_Dir with a pathname based on + # Directories.Libdir. +done + %else # Copy the source files. @@ -282,6 +301,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Moved all libraries from '_libdir/xmlada' to '_libdir'. - Fix up the symbolic links for the shared libraries. - Moved documentation and examples into a separate package. +- Made the generated project files architecture-independent. +- Added a build dependency on sed, removed the explicit version dependency on GPRbuild. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f10937164fe0b8592caabaf26137a00ef48ee8f8 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 11 Oct 2022 18:51:44 +0200 Subject: [PATCH 39/69] Update comment on building in bootstrap mode. --- xmlada.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 80977d4..5b2903a 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,12 @@ -# Set this variable to %GPRbuild_arches for bootstrapping of -# gprbuild on new architecture or in case of new major version of -# the gcc-gnat package. +# To build this package in bootstrap mode, set variable `bootstrap_arch` to +# `%GPRbuild_arches`. To build this package in normal mode, set `bootstrap_arch` +# to any value other than a well-known architecture name. Do not leave the +# `bootstrap_arch` variable empty as this will make the spec syntactically +# invalid. +# +# For more information on building in bootstrap mode, see the `gprbuild` +# spec-file. +# %global bootstrap_arch no_bootstrapping #global bootstrap_arch %GPRbuild_arches @@ -44,7 +50,6 @@ BuildRequires: latexmk # Build only on architectures where GPRbuild is available. ExclusiveArch: %{GPRbuild_arches} - %global common_description_en \ XML/Ada includes support for parsing XML files, including DTDs, full support for \ SAX, and an almost complete support for the core part of the DOM. It includes \ From 3b7fb2087885cf67d13f55d132bdf60ab33d353f Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 22 Oct 2022 00:26:16 +0200 Subject: [PATCH 40/69] Use a configuration option to enable bootstrap build mode. --- xmlada.spec | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5b2903a..4e40704 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,14 +1,7 @@ -# To build this package in bootstrap mode, set variable `bootstrap_arch` to -# `%GPRbuild_arches`. To build this package in normal mode, set `bootstrap_arch` -# to any value other than a well-known architecture name. Do not leave the -# `bootstrap_arch` variable empty as this will make the spec syntactically -# invalid. -# -# For more information on building in bootstrap mode, see the `gprbuild` -# spec-file. -# -%global bootstrap_arch no_bootstrapping -#global bootstrap_arch %GPRbuild_arches +# This package has a bootstrap build mode that can be used to create a source +# code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more +# information. +%bcond_with bootstrap # Upstream source information. %global upstream_owner AdaCore @@ -39,7 +32,7 @@ Source1: xmlada.gpr Patch: %{name}-gprinstall-relocate-artifacts.patch BuildRequires: make -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx @@ -62,7 +55,7 @@ support for validating XML files with XML schemas. ## Subpackages ## ################# -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %package devel Summary: Development files for the XML/Ada library @@ -140,7 +133,7 @@ sed --in-place --expression 's/18.0w/%{version}/' configure configure.in ########### %build -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %configure --enable-build=distrib --enable-shared # Build the libraries. @@ -160,7 +153,7 @@ make -C docs html latexpdf ############# %install -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} # Verify that the ALI files of both builds (relocatable and static-pic) match. # The verfication is necessary as GPRinstall will overwrite the ALI files during @@ -248,7 +241,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ## Files ## ########### -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %files %license COPYING3 COPYING.RUNTIME @@ -308,6 +301,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Moved documentation and examples into a separate package. - Made the generated project files architecture-independent. - Added a build dependency on sed, removed the explicit version dependency on GPRbuild. +- Bootstrap mode can now be enabled via a configuration option. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ab96e89347c1f07bc92ed545e64cbd71729f6da0 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 23 Oct 2022 16:12:32 +0200 Subject: [PATCH 41/69] Update to v23.0.0. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5784613..61a79ac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xmlada-2019-20190429-19B9D-src.tar.gz /xmlada-2020-20200429-19A99-src.tar.gz /xmlada-22.0.0.tar.gz +/xmlada-23.0.0.tar.gz diff --git a/sources b/sources index c48183b..ab000ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-22.0.0.tar.gz) = 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e \ No newline at end of file +SHA512 (xmlada-23.0.0.tar.gz) = a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb \ No newline at end of file diff --git a/xmlada.spec b/xmlada.spec index 4e40704..81846ce 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 22.0.0 +%global upstream_version 23.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada @@ -120,10 +120,6 @@ on which GPRbuild is not yet available. %prep %autosetup -p1 -# Revoke bogus exec permissions. -find . -name '*.gpr' -exec chmod -x {} \; -find docs -type f -exec chmod -x {} \; - # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -280,6 +276,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Feb 14 2023 Dennis van Raaij - 2:23.0.0-1 +- Updated to v23.0.0, using the archive available on GitHub. +- Removed backport patch for improved Unicode support. +- Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). + * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. - Changed the epoch to mark the new upstream version scheme. From cea137f38261d3af035b2b7d334fe22893492711 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 10 Mar 2023 21:30:57 +0100 Subject: [PATCH 42/69] Move documentation back to where it was and move examples manually. --- xmlada-gprinstall-relocate-artifacts.patch | 34 ---------------------- xmlada.spec | 25 +++++++++++----- 2 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 xmlada-gprinstall-relocate-artifacts.patch diff --git a/xmlada-gprinstall-relocate-artifacts.patch b/xmlada-gprinstall-relocate-artifacts.patch deleted file mode 100644 index e929ef1..0000000 --- a/xmlada-gprinstall-relocate-artifacts.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/input_sources/xmlada_input.gpr -+++ b/input_sources/xmlada_input.gpr -@@ -39,13 +39,24 @@ - package Ide renames XmlAda_Shared.Ide; - - package Install is -- for Artifacts ("share/doc/xmlada") -- use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); -- for Artifacts ("share/gpr") use ("../distrib/xmlada.gpr"); -- for Artifacts ("share/examples/xmlada/dom") use ("../docs/dom/*"); -- for Artifacts ("share/examples/xmlada/sax") use ("../docs/sax/*"); -- for Artifacts ("share/examples/xmlada/schema") use ("../docs/schema/*"); -- for Artifacts ("share/examples/xmlada/cross") use ("../docs/cross/*"); -+ -+ for Artifacts ("share/doc/xmlada/html/") -+ use ("../docs/_build/html/**"); -+ for Artifacts ("share/doc/xmlada/pdf/") -+ use ("../docs/_build/latex/XMLAda.pdf"); -+ -+ for Artifacts ("share/gpr/") -+ use ("../distrib/xmlada.gpr"); -+ -+ for Artifacts ("share/doc/xmlada/examples/dom/") -+ use ("../docs/dom/*"); -+ for Artifacts ("share/doc/xmlada/examples/sax/") -+ use ("../docs/sax/*"); -+ for Artifacts ("share/doc/xmlada/examples/schema/") -+ use ("../docs/schema/*"); -+ for Artifacts ("share/doc/xmlada/examples/cross/") -+ use ("../docs/cross/*"); -+ - end Install; - - end XmlAda_Input; diff --git a/xmlada.spec b/xmlada.spec index 81846ce..a8f09f0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -28,9 +28,6 @@ Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_ve # separately, we need to maintain and install it manually. Source1: xmlada.gpr -# [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. -Patch: %{name}-gprinstall-relocate-artifacts.patch - BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed @@ -202,6 +199,15 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done +# Move examples to the _pkgdocdir and remove the remaining empty directories. +mkdir %{buildroot}%{_pkgdocdir}/examples + +mv %{buildroot}%{_datadir}/examples/%{name}/* \ + %{buildroot}%{_pkgdocdir}/examples/ + +rmdir %{buildroot}%{_datadir}/examples/%{name} +rmdir %{buildroot}%{_datadir}/examples + # Make the generated project files architecture-independent. for component in dom input schema unicode sax ; do sed --regexp-extended --in-place \ @@ -256,12 +262,15 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files doc %dir %{_pkgdocdir} -%{_pkgdocdir}/html -%{_pkgdocdir}/pdf +%{_pkgdocdir}/*.html +%{_pkgdocdir}/searchindex.js +%{_pkgdocdir}/_sources +%{_pkgdocdir}/_static +%{_pkgdocdir}/XMLAda.pdf %{_pkgdocdir}/examples # Exclude Sphinx-generated files that aren't needed in the package. -%exclude %{_pkgdocdir}/html/.buildinfo -%exclude %{_pkgdocdir}/html/objects.inv +%exclude %{_pkgdocdir}/.buildinfo +%exclude %{_pkgdocdir}/objects.inv %else @@ -280,6 +289,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. - Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). +- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files manually after install. +- Moved the documentation back to where is was until version 2:22.0.0. * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. From e2897d15b65a76fab2b117159d25c03890da6fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:17:49 +0100 Subject: [PATCH 43/69] Simplified the install section a bit. --- xmlada.spec | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index a8f09f0..65c92cd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -159,34 +159,31 @@ for component_dir in dom schema unicode sax input_sources ; do done # Install each component. -for libtype in relocatable static-pic ; do - - for component in dom schema unicode sax ; do - gprinstall --create-missing-dirs --no-manifest \ - --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component} \ - --project-subdir=%{buildroot}%{_GNAT_project_dir} \ - --ali-subdir=%{buildroot}%{_libdir}/%{name} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir} \ - --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ - --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ - -P ${component}/%{name}_${component}.gpr - done - - # The "input" component needs special treatment as its dirname in the source - # tree ("input_sources") is not reflected in its GNAT project file - # ("xmlada_input.gpr"). +function run_gprinstall { + local libtype=$1 + local component=$2 + local directory=$3 # directory name in the source tree gprinstall --create-missing-dirs --no-manifest \ --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/input \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component}\ --project-subdir=%{buildroot}%{_GNAT_project_dir} \ --ali-subdir=%{buildroot}%{_libdir}/%{name} \ --lib-subdir=%{buildroot}%{_libdir} \ --link-lib-subdir=%{buildroot}%{_libdir} \ --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ - -P input_sources/%{name}_input.gpr + -P ${directory}/%{name}_${component}.gpr +} + +for libtype in relocatable static-pic ; do + for component in dom schema unicode sax ; do + run_gprinstall ${libtype} ${component} ${component} + done + + # The "input" component needs special treatment as its dirname in the source + # tree ("input_sources") is not reflected in its GNAT project file + # ("xmlada_input.gpr"). + run_gprinstall ${libtype} input input_sources done # Install the aggregate project file ("xmlada.gpr"). @@ -199,13 +196,10 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done -# Move examples to the _pkgdocdir and remove the remaining empty directories. -mkdir %{buildroot}%{_pkgdocdir}/examples +# Move examples to the _pkgdocdir and remove the remaining empty directory. +mv --no-target-directory %{buildroot}%{_datadir}/examples/%{name} \ + %{buildroot}%{_pkgdocdir}/examples -mv %{buildroot}%{_datadir}/examples/%{name}/* \ - %{buildroot}%{_pkgdocdir}/examples/ - -rmdir %{buildroot}%{_datadir}/examples/%{name} rmdir %{buildroot}%{_datadir}/examples # Make the generated project files architecture-independent. From faf81443c691a4b6ca50721820f88c4e0fb0c3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:23:52 +0100 Subject: [PATCH 44/69] wording correction What a computer does is not done "manually". --- xmlada.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 65c92cd..5975680 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -283,7 +283,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. - Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). -- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files manually after install. +- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files after + GPRinstall has run. - Moved the documentation back to where is was until version 2:22.0.0. * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 From 5ace0f0729400e1be01c5f475791c10cf93faa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:26:08 +0100 Subject: [PATCH 45/69] formatting --- xmlada.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5975680..53e98f7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -188,7 +188,7 @@ done # Install the aggregate project file ("xmlada.gpr"). install --mode=u=rw,go=r,a-s --preserve-timestamps \ - %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} + %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} # Fix up the symbolic links for the shared libraries. for component in dom input_sources schema unicode sax ; do @@ -290,12 +290,14 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. - Changed the epoch to mark the new upstream version scheme. -- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll packages. +- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll + packages. - Updated the license, a runtime exception has now been added. - Added new build dependencies to build the documentation with Sphinx and LaTeX. - Examples are now located in _pkgdocdir/examples. - License field now contains an SPDX license expression. -- Added the Unicode license to cover all code that has been generated using Unicode data. +- Added the Unicode license to cover all code that has been generated using + Unicode data. - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. @@ -307,7 +309,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Fix up the symbolic links for the shared libraries. - Moved documentation and examples into a separate package. - Made the generated project files architecture-independent. -- Added a build dependency on sed, removed the explicit version dependency on GPRbuild. +- Added a build dependency on sed, removed the explicit version dependency on + GPRbuild. - Bootstrap mode can now be enabled via a configuration option. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 From 47eda5202f25395fa8f069b587d478cbaca60ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:51:37 +0100 Subject: [PATCH 46/69] Using GPRbuild_flags requires a very new fedora-gnat-project-common. --- xmlada.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 53e98f7..43e0ad8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -31,7 +31,8 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -BuildRequires: fedora-gnat-project-common +# A fedora-gnat-project-common that contains GPRbuild_flags is needed. +BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex BuildRequires: latexmk @@ -279,6 +280,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Mon Mar 13 2023 Björn Persson - 2:23.0.0-2 +- Set a minimum version of fedora-gnat-project-common. +- Simplified the install section a bit. + * Tue Feb 14 2023 Dennis van Raaij - 2:23.0.0-1 - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. From 6800935a2bcbef8c6c2cea427c3e8307b84b1a5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:01:15 +0000 Subject: [PATCH 47/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 43e0ad8..7ec5247 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2:23.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Mar 13 2023 Björn Persson - 2:23.0.0-2 - Set a minimum version of fedora-gnat-project-common. - Simplified the install section a bit. From e8dcfc5f1349eeacb64a5420caa6db8406440e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 16 Jan 2024 11:16:40 +0100 Subject: [PATCH 48/69] Rebuilt with GCC 14 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 7ec5247..840ab5e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Jan 16 2024 Björn Persson - 2:23.0.0-4 +- Rebuilt with GCC 14 prerelease. + * Sat Jul 22 2023 Fedora Release Engineering - 2:23.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 35e4b1c293bf8f29169eb5b3251309b73d6d5873 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:52:15 +0000 Subject: [PATCH 49/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 840ab5e..5267f60 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2:23.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Björn Persson - 2:23.0.0-4 - Rebuilt with GCC 14 prerelease. From 4ff40cd1954321a8407414b3961f73c78844c5d3 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 8 Dec 2023 20:06:39 +0100 Subject: [PATCH 50/69] Update to v24.0.0. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61a79ac..902cffe 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /xmlada-2020-20200429-19A99-src.tar.gz /xmlada-22.0.0.tar.gz /xmlada-23.0.0.tar.gz +/xmlada-24.0.0.tar.gz diff --git a/sources b/sources index ab000ed..3c545d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-23.0.0.tar.gz) = a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb \ No newline at end of file +SHA512 (xmlada-24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d \ No newline at end of file diff --git a/xmlada.spec b/xmlada.spec index 5267f60..0589eb2 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 23.0.0 +%global upstream_version 24.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -34,6 +34,7 @@ BuildRequires: gcc-gnat gprbuild sed # A fedora-gnat-project-common that contains GPRbuild_flags is needed. BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex BuildRequires: latexmk %endif @@ -280,6 +281,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Jan 28 2024 Dennis van Raaij - 2:24.0.0-1 +- Updated to v24.0.0. +- Generated HTML-documentation now uses the 'Read the Docs' Sphinx theme. + * Sat Jan 27 2024 Fedora Release Engineering - 2:23.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2ae77acab81ddb41ac8ae007bc03067d943806ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Thu, 25 Apr 2024 18:02:47 +0200 Subject: [PATCH 51/69] Use the macro GPRinstall. --- xmlada.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0589eb2..e2f3bdd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -31,8 +31,8 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -# A fedora-gnat-project-common that contains GPRbuild_flags is needed. -BuildRequires: fedora-gnat-project-common >= 3.17 +# A fedora-gnat-project-common that contains the macro GPRinstall is needed. +BuildRequires: fedora-gnat-project-common >= 3.21 BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex @@ -165,13 +165,7 @@ function run_gprinstall { local libtype=$1 local component=$2 local directory=$3 # directory name in the source tree - gprinstall --create-missing-dirs --no-manifest \ - --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component}\ - --project-subdir=%{buildroot}%{_GNAT_project_dir} \ - --ali-subdir=%{buildroot}%{_libdir}/%{name} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir} \ + %{GPRinstall -s xmlada/${component}} \ --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ -P ${directory}/%{name}_${component}.gpr From f0a6f1e191567fc770f3437420a8cbffb8e231bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Wed, 15 May 2024 23:33:17 +0200 Subject: [PATCH 52/69] Added a missing bootstrap dependency on findutils. --- xmlada.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index e2f3bdd..38c3bcb 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -37,6 +37,8 @@ BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex BuildRequires: latexmk +%else +BuildRequires: findutils %endif # Build only on architectures where GPRbuild is available. From de4407abc12ecd1d4621c3a8ad415de037457522 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:13:11 +0000 Subject: [PATCH 53/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 38c3bcb..01e88f8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2:24.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jan 28 2024 Dennis van Raaij - 2:24.0.0-1 - Updated to v24.0.0. - Generated HTML-documentation now uses the 'Read the Docs' Sphinx theme. From 0ed304da955e44fa7416705aacbc9d47772a0c22 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 25 Oct 2024 18:17:22 +0200 Subject: [PATCH 54/69] Update to v25.0.0 --- .gitignore | 1 + sources | 2 +- xmlada.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 902cffe..999a3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xmlada-22.0.0.tar.gz /xmlada-23.0.0.tar.gz /xmlada-24.0.0.tar.gz +/xmlada-25.0.0.tar.gz diff --git a/sources b/sources index 3c545d4..6c6c8aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d \ No newline at end of file +SHA512 (xmlada-25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0 diff --git a/xmlada.spec b/xmlada.spec index 01e88f8..51f74dd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 24.0.0 +%global upstream_version 25.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Oct 27 2024 Dennis van Raaij - 2:25.0.0-1 +- Updated to v25.0.0. + * Sat Jul 20 2024 Fedora Release Engineering - 2:24.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8d9e2649b0526d0aa9298eab49f6e5f10566cc10 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 23 Oct 2022 17:15:35 +0200 Subject: [PATCH 55/69] Enable bootstrapping --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 51f74dd..32ea5a3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,7 +1,7 @@ # This package has a bootstrap build mode that can be used to create a source # code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more # information. -%bcond_with bootstrap +%bcond_without bootstrap # Upstream source information. %global upstream_owner AdaCore From dcffa6d8f9dd3250514af12e8c5513b6748de82b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 4 Dec 2024 15:21:33 +0100 Subject: [PATCH 56/69] Disable bootstrapping This reverts commit 8d9e2649b0526d0aa9298eab49f6e5f10566cc10. --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 32ea5a3..104c697 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,7 +1,7 @@ # This package has a bootstrap build mode that can be used to create a source # code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more # information. -%bcond_without bootstrap +%bcond_with bootstrap # Upstream source information. %global upstream_owner AdaCore @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Wed Dec 04 2024 Pavel Zhukov - 2:25.0.0-2 +- Disable bootstrap + * Sun Oct 27 2024 Dennis van Raaij - 2:25.0.0-1 - Updated to v25.0.0. From f90fa89c6b6bb774f2d6a88f0461c989d8465898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Jan 2025 18:15:50 +0100 Subject: [PATCH 57/69] Rebuilt with GCC 15 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 104c697..f23bcca 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Mon Jan 13 2025 Björn Persson - 2:25.0.0-3 +- Rebuilt with GCC 15 prerelease. + * Wed Dec 04 2024 Pavel Zhukov - 2:25.0.0-2 - Disable bootstrap From 12a2ad169de15d20b4eb878487f4612a35f3bfd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Wed, 15 Jan 2025 12:12:39 +0100 Subject: [PATCH 58/69] Rebuilt with another GCC 15 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index f23bcca..ab7e41e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Wed Jan 15 2025 Björn Persson - 2:25.0.0-4 +- Rebuilt with another GCC 15 prerelease. + * Mon Jan 13 2025 Björn Persson - 2:25.0.0-3 - Rebuilt with GCC 15 prerelease. From 0bb1a50af472d42660247cc4e6a7b9a47c098a07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:00:50 +0000 Subject: [PATCH 59/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index ab7e41e..923d0b7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2:25.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Björn Persson - 2:25.0.0-4 - Rebuilt with another GCC 15 prerelease. From c50d3f879919cc790e6bce6f152ed24ccfa554a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:51 +0000 Subject: [PATCH 60/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 923d0b7..16e6c38 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2:25.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2:25.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cfec7ec92458f7f9cfc3b5560d195ae043c58884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Fri, 8 Aug 2025 20:57:35 +0200 Subject: [PATCH 61/69] Rebuilt because the ALI of System.OS_Constants changed. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 16e6c38..de5b062 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Aug 08 2025 Björn Persson - 2:25.0.0-7 +- Rebuilt because the ALI of System.OS_Constants changed. + * Fri Jul 25 2025 Fedora Release Engineering - 2:25.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 61efeea091cb11381325b170cd5cff7fba0ae548 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:56:28 +0100 Subject: [PATCH 62/69] Update to v26.0.0 --- .gitignore | 1 + sources | 2 +- xmlada.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 999a3c5..6052736 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xmlada-23.0.0.tar.gz /xmlada-24.0.0.tar.gz /xmlada-25.0.0.tar.gz +/xmlada-26.0.0.tar.gz diff --git a/sources b/sources index 6c6c8aa..313a9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0 +SHA512 (xmlada-26.0.0.tar.gz) = b97f7727df52229f8e76ab169f4b42b9b82b20c82555607d65455f6cb7836c83219017a45b832de38b348e595f5a68d0987e3c568293b45fc285ffdc3ec3aa01 diff --git a/xmlada.spec b/xmlada.spec index de5b062..3eedfee 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 25.0.0 -%global upstream_gittag v%{upstream_version} +%global upstream_version 26.0.0 +%global upstream_commit 5e5b761eb827f458efd2043a5e9ab03e1a614720 Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 7%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -21,7 +21,7 @@ License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 # generating some of XML/Ada's source code. URL: https://github.com/%{upstream_owner}/%{upstream_name} -Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz +Source0: %{url}/archive/%{upstream_commit}.tar.gz#/%{upstream_name}-%{upstream_version}.tar.gz # XML/Ada's aggregate project file. This project file is normally generated and # installed by GPRinstall, but as we'll install each XML/Ada component @@ -119,7 +119,7 @@ on which GPRbuild is not yet available. ############# %prep -%autosetup -p1 +%autosetup -C -p1 # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Dec 23 2025 Dennis van Raaij - 2:26.0.0-1 +- Updated to v26.0.0. + * Fri Aug 08 2025 Björn Persson - 2:25.0.0-7 - Rebuilt because the ALI of System.OS_Constants changed. From d13e0833dbf3daf7dbc86b02b1c4af61427a9089 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:56:40 +0100 Subject: [PATCH 63/69] Add missing font dependencies --- xmlada.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 3eedfee..f5c36ff 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -90,6 +90,10 @@ BuildArch: noarch License: AdaCore-doc AND MIT AND BSD-2-Clause # License for the documentation is AdaCore-doc. The Javascript and CSS files # that Sphinx includes with the documentation are BSD 2-Clause and MIT-licensed. +Requires: font(fontawesome) +Requires: font(lato) +Requires: font(robotoslab) +# Fonts are required by the Read the Docs Sphinx theme. %description doc %{common_description_en} From 826a49879277440dcf6f4905b2988966135f40d4 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:57:39 +0100 Subject: [PATCH 64/69] Remove explicit build dependency on latexmk It is included through python3-sphinx-latex. --- xmlada.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index f5c36ff..0343ee6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -34,9 +34,8 @@ BuildRequires: gcc-gnat gprbuild sed # A fedora-gnat-project-common that contains the macro GPRinstall is needed. BuildRequires: fedora-gnat-project-common >= 3.21 BuildRequires: python3-sphinx -BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex -BuildRequires: latexmk +BuildRequires: python3-sphinx_rtd_theme %else BuildRequires: findutils %endif From 7b435530dede67a6ecb259a4fc884c94e213293d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 6 Jan 2026 20:58:50 +0100 Subject: [PATCH 65/69] Remove version constraint on fedora-gnat-project-common The constraint is satisfied in all supported versions of Fedora. --- xmlada.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0343ee6..01a25a8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -31,8 +31,7 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -# A fedora-gnat-project-common that contains the macro GPRinstall is needed. -BuildRequires: fedora-gnat-project-common >= 3.21 +BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex BuildRequires: python3-sphinx_rtd_theme From 50187327edc983583b538e4988cd7403635b788b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:30 +0000 Subject: [PATCH 66/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 01a25a8..f1e9c4b 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2:26.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 23 2025 Dennis van Raaij - 2:26.0.0-1 - Updated to v26.0.0. From 60ec67aed1a52d3f6d7ae2c9445b2a596212e5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 28 Mar 2026 23:10:53 +0100 Subject: [PATCH 67/69] Rebuilt because GCC 16.0.1-0.10 broke ALI. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index f1e9c4b..4ae6960 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Mar 28 2026 Björn Persson - 2:26.0.0-3 +- Rebuilt because GCC 16.0.1-0.10 broke ALI. + * Sat Jan 17 2026 Fedora Release Engineering - 2:26.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 66b7efa76d7740ef019fb7b8d3239b9509820ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 10 May 2026 20:06:51 +0200 Subject: [PATCH 68/69] Rebuilt because GCC broke ALI again. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 4ae6960..a726f52 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun May 10 2026 Björn Persson - 2:26.0.0-4 +- Rebuilt because GCC broke ALI again. + * Sat Mar 28 2026 Björn Persson - 2:26.0.0-3 - Rebuilt because GCC 16.0.1-0.10 broke ALI. From 69f8c98e46e09bf6f2f5c565545629ed6d0aea70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:19 +0000 Subject: [PATCH 69/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a726f52..bb65e7e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2:26.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sun May 10 2026 Björn Persson - 2:26.0.0-4 - Rebuilt because GCC broke ALI again.