diff --git a/.gitignore b/.gitignore index 6052736..61a79ac 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,3 @@ /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 -/xmlada-25.0.0.tar.gz -/xmlada-26.0.0.tar.gz diff --git a/sources b/sources index 313a9f1..ab000ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-26.0.0.tar.gz) = b97f7727df52229f8e76ab169f4b42b9b82b20c82555607d65455f6cb7836c83219017a45b832de38b348e595f5a68d0987e3c568293b45fc285ffdc3ec3aa01 +SHA512 (xmlada-23.0.0.tar.gz) = a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb \ No newline at end of file diff --git a/xmlada.spec b/xmlada.spec index bb65e7e..dc71697 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,18 +1,18 @@ # 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 %global upstream_name xmlada -%global upstream_version 26.0.0 -%global upstream_commit 5e5b761eb827f458efd2043a5e9ab03e1a614720 +%global upstream_version 23.0.0 +%global upstream_gittag v%{upstream_version} Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 5%{?dist} +Release: 2%{?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_commit}.tar.gz#/%{upstream_name}-%{upstream_version}.tar.gz +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 @@ -31,17 +31,13 @@ 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: python3-sphinx_rtd_theme -%else -BuildRequires: findutils +BuildRequires: latexmk %endif -# 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 \ @@ -88,10 +84,6 @@ 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} @@ -121,7 +113,7 @@ on which GPRbuild is not yet available. ############# %prep -%autosetup -C -p1 +%autosetup -p1 # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -169,7 +161,13 @@ function run_gprinstall { local libtype=$1 local component=$2 local directory=$3 # directory name in the source tree - %{GPRinstall -s xmlada/${component}} \ + 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 ${directory}/%{name}_${component}.gpr @@ -279,58 +277,6 @@ 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. - -* 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 - -* 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. - -* 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 - -* 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. - -* 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. - -* 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. - -* 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. - -* 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.