diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 962743e..8c38ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -34,49 +34,3 @@ iso-codes-3.19.tar.bz2 /iso-codes-3.47.tar.xz /iso-codes-3.48.tar.xz /iso-codes-3.49.tar.xz -/iso-codes-3.50.tar.xz -/iso-codes-3.51.tar.xz -/iso-codes-3.52.tar.xz -/iso-codes-3.53.tar.xz -/iso-codes-3.54.tar.xz -/iso-codes-3.55.tar.xz -/iso-codes-3.56.tar.xz -/iso-codes-3.57.tar.xz -/iso-codes-3.58.tar.xz -/iso-codes-3.59.tar.xz -/iso-codes-3.60.tar.xz -/iso-codes-3.61.tar.xz -/iso-codes-3.62.tar.xz -/iso-codes-3.63.tar.xz -/iso-codes-3.64.tar.xz -/iso-codes-3.65.tar.xz -/iso-codes-3.66.tar.xz -/iso-codes-3.67.tar.xz -/iso-codes-3.68.tar.xz -/iso-codes-3.69.tar.xz -/iso-codes-3.70.tar.xz -/iso-codes-3.71.tar.xz -/iso-codes-3.72.tar.xz -/iso-codes-3.73.tar.xz -/iso-codes-3.74.tar.xz -/iso-codes-3.75.tar.xz -/iso-codes-3.76.tar.xz -/iso-codes-3.77.tar.xz -/iso-codes-iso-codes-3.79.tar.gz -/iso-codes-iso-codes-4.1.tar.gz -/iso-codes-iso-codes-4.2.tar.gz -/iso-codes-iso-codes-4.3.tar.gz -/iso-codes-iso-codes-4.4.tar.gz -/iso-codes-iso-codes-4.5.0.tar.gz -/iso-codes-iso-codes-4.6.0.tar.gz -/iso-codes-v4.9.0.tar.gz -/iso-codes-v4.10.0.tar.gz -/iso-codes-v4.11.0.tar.gz -/iso-codes-v4.12.0.tar.gz -/iso-codes-v4.13.0.tar.gz -/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 -/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..9260a65 100644 --- a/iso-codes.spec +++ b/iso-codes.spec @@ -1,16 +1,13 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 4.20.1 -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 - +Version: 3.49 +Release: 1%{?dist} +License: LGPLv2+ +Group: System Environment/Base +URL: http://alioth.debian.org/projects/pkg-isocodes/ +Source0: http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-%{version}.tar.xz BuildRequires: gettext -BuildRequires: python3 -BuildRequires: meson BuildArch: noarch - # for /usr/share/xml Requires: xml-common @@ -21,272 +18,35 @@ sub-territory lists, and all their translations in gettext format. %package devel Summary: Files for development using %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the pkg-config files for development when building programs that use %{name}. -%prep -%autosetup -n %{name}-v%{version} -# The '&' character is not getting parsed using xmllint -# Change it to "and" word -sed -i 's/ & / and /g' data/iso_3166-2.json +%prep +%setup -q %build -%meson -%meson_build +%configure +make %{_smp_mflags} %install -%meson_install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -%check -%meson_test +%find_lang iso-codes --all-name -%find_lang %{name} --all-name - -%files -f %{name}.lang -%doc CHANGELOG.md README.md -%license LICENSES/LGPL-2.1-or-later.txt +%files -f iso-codes.lang +%doc ChangeLog README LICENSE %dir %{_datadir}/xml/iso-codes %{_datadir}/xml/iso-codes/*.xml -%{_datadir}/iso-codes %files devel %{_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 - -* 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 - -* Mon Sep 16 2024 Parag Nemade - 4.17.0-1 -- Update to 4.17.0 version (#2312301) - -* Thu Jul 18 2024 Fedora Release Engineering - 4.16.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jul 12 2024 Parag Nemade - 4.16.0-4 -- Fix xmllint error for iso_3166-2.xml file - -* Wed Jan 24 2024 Fedora Release Engineering - 4.16.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 4.16.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 15 2024 Parag Nemade - 4.16.0-1 -- Update to 4.16.0 version (#2258341) - -* Thu Jul 20 2023 Fedora Release Engineering - 4.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 28 2023 Parag Nemade - 4.15.0-1 -- Update to 4.15.0 version (#2190318) - -* Tue Feb 28 2023 Parag Nemade - 4.13.0-1 -- Update to 4.13.0 version (#2173897) - -* Thu Jan 19 2023 Fedora Release Engineering - 4.12.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Dec 02 2022 Parag Nemade - 4.12.0-2 -- Update license tag to SPDX format - -* Thu Nov 10 2022 Parag Nemade - 4.12.0-1 -- Update to 4.12.0 version (#2140456) - -* Mon Jul 25 2022 Parag Nemade - 4.11.0-1 -- Update to 4.11.0 version (#2110786) - -* Thu Jul 21 2022 Fedora Release Engineering - 4.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 02 2022 Parag Nemade - 4.10.0-1 -- Update to 4.10.0 version (#2092413) - -* Thu Jan 20 2022 Fedora Release Engineering - 4.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 04 2022 Parag Nemade - 4.9.0-1 -- Update to 4.9.0 version (#2036757) - -* Fri Nov 05 2021 Parag Nemade - 4.8.0-1 -- Update to 4.8.0 version (#2019880) -- Adjust upstream tarball Source URL - -* Thu Jul 22 2021 Fedora Release Engineering - 4.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Mar 08 2021 Parag Nemade - 4.6.0-1 -- Update to 4.6.0 version (#1936377) - -* Tue Jan 26 2021 Fedora Release Engineering - 4.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 4.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed May 20 2020 Parag Nemade - 4.5.0-1 -- Update to 4.5.0 version (#1837748) - -* Wed Jan 29 2020 Fedora Release Engineering - 4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Oct 09 2019 Parag Nemade - 4.4-1 -- Update to 4.4 version (#1758138) - -* Fri Aug 16 2019 Parag Nemade - 4.3-2 -- Simple rebuilt to have f32 and f31 dist-git in sync - -* Fri Aug 16 2019 Parag Nemade - 4.3-1 -- Update to 4.3 version (#1733770) - -* Thu Jul 25 2019 Fedora Release Engineering - 4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 28 2019 Parag Nemade - 4.2-1 -- Update to 4.2 version (#1669653) - -* Fri Dec 14 2018 Parag Nemade - 4.1-1 -- Update to 4.1 version (#1659319) -- Upstream moved ChangeLog to ChangeLog.md - -* Fri Jul 13 2018 Fedora Release Engineering - 3.79-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed May 16 2018 Parag Nemade - 3.79-1 -- Update to 3.79 version (#1577820) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.77-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Nov 22 2017 Parag Nemade - 3.77-1 -- Update to 3.77 version (#1516284) - -* Tue Sep 19 2017 Parag Nemade - 3.76-1 -- Update to 3.76 version - -* Wed Jul 26 2017 Fedora Release Engineering - 3.75-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Apr 26 2017 Parag Nemade - 3.75-1 -- Update to 3.75 version - -* Fri Feb 10 2017 Fedora Release Engineering - 3.74-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 19 2017 Parag Nemade - 3.74-1 -- Update to 3.74 - -* Tue Jan 03 2017 Parag Nemade - 3.73-1 -- Update to 3.73 - -* Mon Jan 02 2017 Björn Esser - 3.72-2 -- Updated spec to use recent macros -- Added needed BR: python3 - -* Mon Dec 12 2016 Parag Nemade - 3.72-1 -- Update to 3.72 - -* Thu Nov 17 2016 Parag Nemade - 3.71-1 -- Update to 3.71 - -* Tue Aug 30 2016 Parag Nemade - 3.70-1 -- Update to 3.70 - -* Mon Aug 08 2016 Parag Nemade - 3.69-1 -- Update to 3.69 - -* Tue May 03 2016 Parag Nemade - 3.68-1 -- Upstream renamed README to README.md -- Update to 3.68 - -* Mon Apr 04 2016 Parag Nemade - 3.67-1 -- Update to 3.67 -- LICENSE renamed to COPYING file - -* Wed Mar 02 2016 Parag Nemade - 3.66-1 -- Update to 3.66 -- Upstream now providing json formatted iso-codes data - -* Thu Feb 04 2016 Parag Nemade - 3.65-1 -- Update to 3.65 - -* Thu Feb 04 2016 Fedora Release Engineering - 3.64-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 05 2016 Parag Nemade - 3.64-1 -- Update to 3.64 - -* Fri Nov 27 2015 Parag Nemade - 3.63-1 -- Update to 3.63 - -* Fri Oct 02 2015 Parag Nemade - 3.62-1 -- Update to 3.62 - -* Wed Sep 02 2015 Parag Nemade - 3.61-1 -- Update to 3.61 -- Drop Group tag -- use %%license macro - -* Mon Aug 03 2015 Parag Nemade - 3.60-1 -- Update to 3.60 - -* Fri Jul 03 2015 Parag Nemade - 3.59-1 -- Update to 3.59 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.58-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jun 09 2015 Parag Nemade - 3.58-1 -- Update to 3.58 - -* Tue Oct 28 2014 Parag Nemade - 3.57-1 -- Update to 3.57 - -* Wed Sep 03 2014 Parag Nemade - 3.56-1 -- Update to 3.56 - -* Thu Jul 10 2014 Parag Nemade - 3.55-1 -- Update to 3.55 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.54-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jun 03 2014 Parag Nemade - 3.54-1 -- Update to 3.54 - -* Fri May 02 2014 Parag Nemade - 3.53-1 -- Update to 3.53 - -* Thu Apr 03 2014 Parag Nemade - 3.52-1 -- Update to 3.52 - -* Tue Feb 04 2014 Parag Nemade - 3.51-1 -- Update to 3.51 - -* Thu Jan 02 2014 Parag Nemade - 3.50-1 -- Update to 3.50 - * Fri Dec 06 2013 Parag Nemade - 3.49-1 - Update to 3.49 diff --git a/plans/iso-codes.fmf b/plans/iso-codes.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/iso-codes.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 0f9fd89..4566ca5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iso-codes-v4.20.1.tar.gz) = 2b5690b109da3d4f969c62f1a9653f6a12f6529794b97d0c834d708ff9a407bc0193047992b2acea7525f4638a68dbd9a6dceec8b0b0d08f23a2fd2e3124b1d2 +a0708a81f42c538f4670e3bf3d343dd8 iso-codes-3.49.tar.xz diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index 6fd6f26..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,7 +0,0 @@ -test: ./runtests.sh -duration: 10m -framework: beakerlib -require: - - iso-codes - - python3-jsonschema - - rpm-build diff --git a/tests/run_test.sh b/tests/run_test.sh deleted file mode 100755 index 8e7fb00..0000000 --- a/tests/run_test.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# If one of the commands below returns non-zero then exit immediately -set -e - -echo "Let's check the upstream data files timestamp" -ls data/iso*.json -l -echo "Validating json data files written with correct syntax" -python3 bin/validate_json_data.py -retval=$? -if [ $retval -ne 0 ]; then - echo "FAILED: Validation of data files" -else - echo "PASSED: Validation of data files" -fi - -echo "Let's check timestamp of newly generated data files" -ls data/iso*.json -l diff --git a/tests/runtests.sh b/tests/runtests.sh deleted file mode 100755 index d12439c..0000000 --- a/tests/runtests.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/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 -