diff --git a/.gitignore b/.gitignore index 962743e..82d28ef 100644 --- a/.gitignore +++ b/.gitignore @@ -78,5 +78,3 @@ iso-codes-3.19.tar.bz2 /iso-codes-v4.16.0.tar.gz /iso-codes-v4.17.0.tar.gz /iso-codes-v4.18.0.tar.gz -/iso-codes-v4.19.0.tar.gz -/iso-codes-v4.20.1.tar.gz diff --git a/iso-codes.spec b/iso-codes.spec index f7eb53a..4ba68f5 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,6 +1,6 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 4.20.1 +Version: 4.18.0 Release: 2%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes @@ -8,7 +8,7 @@ Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version BuildRequires: gettext BuildRequires: python3 -BuildRequires: meson +BuildRequires: make BuildArch: noarch # for /usr/share/xml @@ -35,20 +35,17 @@ when building programs that use %{name}. sed -i 's/ & / and /g' data/iso_3166-2.json %build -%meson -%meson_build +%configure +%make_build %install -%meson_install - -%check -%meson_test +%make_install INSTALL="%{__install} -p" %find_lang %{name} --all-name %files -f %{name}.lang %doc CHANGELOG.md README.md -%license LICENSES/LGPL-2.1-or-later.txt +%license COPYING %dir %{_datadir}/xml/iso-codes %{_datadir}/xml/iso-codes/*.xml %{_datadir}/iso-codes @@ -57,15 +54,6 @@ sed -i 's/ & / and /g' data/iso_3166-2.json %{_datadir}/pkgconfig/iso-codes.pc %changelog -* Fri Jan 02 2026 Parag Nemade - 4.20.1-2 -- Upstream moved to meson build system - -* Fri Jan 02 2026 Parag Nemade - 4.20.1-1 -- Update to 4.20.1 version (#2426701) - -* Fri Nov 14 2025 Parag Nemade - 4.19.0-1 -- Update to 4.19.0 version (#2413657) - * Thu Jul 24 2025 Fedora Release Engineering - 4.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 0f9fd89..865aba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iso-codes-v4.20.1.tar.gz) = 2b5690b109da3d4f969c62f1a9653f6a12f6529794b97d0c834d708ff9a407bc0193047992b2acea7525f4638a68dbd9a6dceec8b0b0d08f23a2fd2e3124b1d2 +SHA512 (iso-codes-v4.18.0.tar.gz) = 4f9766b3e73a155df3213d5684f0b4c2aefe3efcdc30b2a969913a90deb73e1cbd32a63c2f00c736517c1feed790944d12155410d3c4d381749c39ecd1f71f96