From 02f73b4ca869a0de11f0e628e43eb65416454275 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sat, 12 Apr 2025 07:24:05 +0530 Subject: [PATCH 1/6] Update to 4.18.0 version (#2359183) --- .gitignore | 1 + iso-codes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5e26669..82d28ef 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ iso-codes-3.19.tar.bz2 /iso-codes-v4.15.0.tar.gz /iso-codes-v4.16.0.tar.gz /iso-codes-v4.17.0.tar.gz +/iso-codes-v4.18.0.tar.gz diff --git a/iso-codes.spec b/iso-codes.spec index 4493b0a..50d8bbc 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,7 +1,7 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 4.17.0 -Release: 2%{?dist} +Version: 4.18.0 +Release: 1%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz @@ -54,6 +54,9 @@ sed -i 's/ & / and /g' data/iso_3166-2.json %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Sat Apr 12 2025 Parag Nemade - 4.18.0-1 +- Update to 4.18.0 version (#2359183) + * Fri Jan 17 2025 Fedora Release Engineering - 4.17.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index b380cd4..865aba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iso-codes-v4.17.0.tar.gz) = 9731270513aa42bda96f277528cf40a47ccdbf7c864ba8a9015f1007ef79cb16aaed0b1c3dd18fca30c923a45e0906f0cc5366fabb85e144fcfeaf82b1943a41 +SHA512 (iso-codes-v4.18.0.tar.gz) = 4f9766b3e73a155df3213d5684f0b4c2aefe3efcdc30b2a969913a90deb73e1cbd32a63c2f00c736517c1feed790944d12155410d3c4d381749c39ecd1f71f96 From 14eddbd84c67d1929e20b2d269d648e097b9c592 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 30 Aug 2024 18:53:31 +0530 Subject: [PATCH 2/6] Add tmt testcase for CI --- .fmf/version | 1 + plans/iso-codes.fmf | 5 +++ tests/main.fmf | 7 +++++ tests/{smoke/runtest.sh => run_test.sh} | 2 -- tests/runtests.sh | 41 +++++++++++++++++++++++++ tests/tests.yml | 16 ---------- 6 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/iso-codes.fmf create mode 100644 tests/main.fmf rename tests/{smoke/runtest.sh => run_test.sh} (97%) mode change 100644 => 100755 create mode 100755 tests/runtests.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/iso-codes.fmf b/plans/iso-codes.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/iso-codes.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..6fd6f26 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,7 @@ +test: ./runtests.sh +duration: 10m +framework: beakerlib +require: + - iso-codes + - python3-jsonschema + - rpm-build diff --git a/tests/smoke/runtest.sh b/tests/run_test.sh old mode 100644 new mode 100755 similarity index 97% rename from tests/smoke/runtest.sh rename to tests/run_test.sh index adad36d..8e7fb00 --- a/tests/smoke/runtest.sh +++ b/tests/run_test.sh @@ -3,8 +3,6 @@ # If one of the commands below returns non-zero then exit immediately set -e -cd ../source - echo "Let's check the upstream data files timestamp" ls data/iso*.json -l echo "Validating json data files written with correct syntax" diff --git a/tests/runtests.sh b/tests/runtests.sh new file mode 100755 index 0000000..d12439c --- /dev/null +++ b/tests/runtests.sh @@ -0,0 +1,41 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +NAME=iso-codes + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm ${NAME} + rlShowPackageVersion ${NAME} + rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "${NAME}" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/${NAME}-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-v${VERSION}" + else + rlRun -t -l "pushd BUILD/${NAME}-v${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun "ls data/iso*.json -l" + rlRun "python3 bin/validate_json_data.py" + rlRun "retval=$?" + rlRun "echo Test return value is $retval" + rlRun "ls data/iso*.json -l" + rlRun "retval2=$?" + rlRun "echo $retval2" + rlRun "popd" 0 + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd + diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 5ba9449..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-source - -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - smoke - required_packages: - - python3-jsonschema From f1d673c923bbd5c7c52e8a4d957eefd3d3f2d16a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:48:34 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- iso-codes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iso-codes.spec b/iso-codes.spec index 50d8bbc..4ba68f5 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,7 +1,7 @@ Name: iso-codes Summary: ISO code lists and translations Version: 4.18.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz @@ -54,6 +54,9 @@ sed -i 's/ & / and /g' data/iso_3166-2.json %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 4.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Apr 12 2025 Parag Nemade - 4.18.0-1 - Update to 4.18.0 version (#2359183) From cc6c6bac652a129c418febbaafecf564bcde79bd Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 14 Nov 2025 11:30:24 +0530 Subject: [PATCH 4/6] Update to 4.19.0 version (#2413657) --- .gitignore | 1 + iso-codes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82d28ef..883f991 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ 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 diff --git a/iso-codes.spec b/iso-codes.spec index 4ba68f5..112eac1 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,7 +1,7 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 4.18.0 -Release: 2%{?dist} +Version: 4.19.0 +Release: 1%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz @@ -54,6 +54,9 @@ sed -i 's/ & / and /g' data/iso_3166-2.json %{_datadir}/pkgconfig/iso-codes.pc %changelog +* 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 865aba3..d91c177 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iso-codes-v4.18.0.tar.gz) = 4f9766b3e73a155df3213d5684f0b4c2aefe3efcdc30b2a969913a90deb73e1cbd32a63c2f00c736517c1feed790944d12155410d3c4d381749c39ecd1f71f96 +SHA512 (iso-codes-v4.19.0.tar.gz) = 3085144ad9936109495a497bb7cfb55ee89ff809525d8e9b56299902335b3cfaf0992643cb3f9d4f1770d71737e6a5a59554be6fc1547b487949dd4bd6b541c1 From b46fcb07994987903083416777c0094e3700f197 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 2 Jan 2026 09:42:21 +0530 Subject: [PATCH 5/6] Update to 4.20.1 version (#2426701) --- .gitignore | 1 + iso-codes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 883f991..962743e 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ iso-codes-3.19.tar.bz2 /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 112eac1..7fd5e39 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,6 +1,6 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 4.19.0 +Version: 4.20.1 Release: 1%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes @@ -54,6 +54,9 @@ 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-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) diff --git a/sources b/sources index d91c177..0f9fd89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iso-codes-v4.19.0.tar.gz) = 3085144ad9936109495a497bb7cfb55ee89ff809525d8e9b56299902335b3cfaf0992643cb3f9d4f1770d71737e6a5a59554be6fc1547b487949dd4bd6b541c1 +SHA512 (iso-codes-v4.20.1.tar.gz) = 2b5690b109da3d4f969c62f1a9653f6a12f6529794b97d0c834d708ff9a407bc0193047992b2acea7525f4638a68dbd9a6dceec8b0b0d08f23a2fd2e3124b1d2 From ff7d6d094add401337798195a4dc14ae66419f5c Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 2 Jan 2026 10:48:09 +0530 Subject: [PATCH 6/6] Upstream moved to meson build system --- iso-codes.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/iso-codes.spec b/iso-codes.spec index 7fd5e39..f7eb53a 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,14 +1,14 @@ Name: iso-codes Summary: ISO code lists and translations Version: 4.20.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later URL: https://salsa.debian.org/iso-codes-team/iso-codes Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz BuildRequires: gettext BuildRequires: python3 -BuildRequires: make +BuildRequires: meson BuildArch: noarch # for /usr/share/xml @@ -35,17 +35,20 @@ when building programs that use %{name}. sed -i 's/ & / and /g' data/iso_3166-2.json %build -%configure -%make_build +%meson +%meson_build %install -%make_install INSTALL="%{__install} -p" +%meson_install + +%check +%meson_test %find_lang %{name} --all-name %files -f %{name}.lang %doc CHANGELOG.md README.md -%license COPYING +%license LICENSES/LGPL-2.1-or-later.txt %dir %{_datadir}/xml/iso-codes %{_datadir}/xml/iso-codes/*.xml %{_datadir}/iso-codes @@ -54,6 +57,9 @@ 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)