Compare commits
38 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff7d6d094a |
||
|
|
b46fcb0799 |
||
|
|
cc6c6bac65 |
||
|
|
f1d673c923 | ||
|
|
14eddbd84c |
||
|
|
02f73b4ca8 |
||
|
|
8849a10958 | ||
|
|
d2d44a6c9f |
||
|
|
6ceff76e36 | ||
|
|
c7c1590f2b |
||
|
|
ca8fd82e96 | ||
|
|
d1ea5f8704 | ||
|
|
4155bcad7c |
||
|
|
3c3d353edd | ||
|
|
2611ef2efa |
||
|
|
6911e2f352 |
||
|
|
013c473478 | ||
|
|
aa9ef1e006 |
||
|
|
ff9e78f04b |
||
|
|
f0567f76e8 |
||
|
|
2f8afa6c63 | ||
|
|
847db14e67 |
||
|
|
d5dc87a095 | ||
|
|
77e94b2e59 |
||
|
|
45eac0e8d0 |
||
|
|
ecf849669e | ||
|
|
19182096cb |
||
|
|
e9cda5cb7b | ||
|
|
a1d2388853 | ||
|
|
b366c8db40 | ||
|
|
899933a76b |
||
|
|
b30b423725 |
||
|
|
3a405ac5b4 | ||
|
|
bfa22b2cb9 |
||
|
|
1c0b87de72 |
||
|
|
d9a40d7d61 |
||
|
|
e751e1776d |
||
|
|
3e4172ce3e |
8 changed files with 208 additions and 10 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
||||||
15
.gitignore
vendored
15
.gitignore
vendored
|
|
@ -65,3 +65,18 @@ iso-codes-3.19.tar.bz2
|
||||||
/iso-codes-iso-codes-3.79.tar.gz
|
/iso-codes-iso-codes-3.79.tar.gz
|
||||||
/iso-codes-iso-codes-4.1.tar.gz
|
/iso-codes-iso-codes-4.1.tar.gz
|
||||||
/iso-codes-iso-codes-4.2.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
|
||||||
|
|
|
||||||
129
iso-codes.spec
129
iso-codes.spec
|
|
@ -1,13 +1,14 @@
|
||||||
Name: iso-codes
|
Name: iso-codes
|
||||||
Summary: ISO code lists and translations
|
Summary: ISO code lists and translations
|
||||||
Version: 4.2
|
Version: 4.20.1
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPL-2.1-or-later
|
||||||
URL: https://salsa.debian.org/iso-codes-team/iso-codes
|
URL: https://salsa.debian.org/iso-codes-team/iso-codes
|
||||||
Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/%{name}-%{version}/%{name}-%{name}-%{version}.tar.gz
|
Source0: https://salsa.debian.org/iso-codes-team/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
|
BuildRequires: meson
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# for /usr/share/xml
|
# for /usr/share/xml
|
||||||
|
|
@ -27,20 +28,27 @@ This package contains the pkg-config files for development
|
||||||
when building programs that use %{name}.
|
when building programs that use %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{name}-%{version}
|
%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
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%meson
|
||||||
%make_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install INSTALL="%{__install} -p"
|
%meson_install
|
||||||
|
|
||||||
|
%check
|
||||||
|
%meson_test
|
||||||
|
|
||||||
%find_lang %{name} --all-name
|
%find_lang %{name} --all-name
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%doc ChangeLog.md README.md
|
%doc CHANGELOG.md README.md
|
||||||
%license COPYING
|
%license LICENSES/LGPL-2.1-or-later.txt
|
||||||
%dir %{_datadir}/xml/iso-codes
|
%dir %{_datadir}/xml/iso-codes
|
||||||
%{_datadir}/xml/iso-codes/*.xml
|
%{_datadir}/xml/iso-codes/*.xml
|
||||||
%{_datadir}/iso-codes
|
%{_datadir}/iso-codes
|
||||||
|
|
@ -49,6 +57,109 @@ when building programs that use %{name}.
|
||||||
%{_datadir}/pkgconfig/iso-codes.pc
|
%{_datadir}/pkgconfig/iso-codes.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 02 2026 Parag Nemade <pnemade AT redhat DOT com> - 4.20.1-2
|
||||||
|
- Upstream moved to meson build system
|
||||||
|
|
||||||
|
* Fri Jan 02 2026 Parag Nemade <pnemade AT redhat DOT com> - 4.20.1-1
|
||||||
|
- Update to 4.20.1 version (#2426701)
|
||||||
|
|
||||||
|
* Fri Nov 14 2025 Parag Nemade <pnemade AT redhat DOT com> - 4.19.0-1
|
||||||
|
- Update to 4.19.0 version (#2413657)
|
||||||
|
|
||||||
|
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Apr 12 2025 Parag Nemade <pnemade AT redhat DOT com> - 4.18.0-1
|
||||||
|
- Update to 4.18.0 version (#2359183)
|
||||||
|
|
||||||
|
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Sep 16 2024 Parag Nemade <pnemade AT redhat DOT com> - 4.17.0-1
|
||||||
|
- Update to 4.17.0 version (#2312301)
|
||||||
|
|
||||||
|
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 12 2024 Parag Nemade <pnemade AT redhat DOT com> - 4.16.0-4
|
||||||
|
- Fix xmllint error for iso_3166-2.xml file
|
||||||
|
|
||||||
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 15 2024 Parag Nemade <pnemade AT redhat DOT com> - 4.16.0-1
|
||||||
|
- Update to 4.16.0 version (#2258341)
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.15.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Apr 28 2023 Parag Nemade <pnemade AT redhat DOT com> - 4.15.0-1
|
||||||
|
- Update to 4.15.0 version (#2190318)
|
||||||
|
|
||||||
|
* Tue Feb 28 2023 Parag Nemade <pnemade AT redhat DOT com> - 4.13.0-1
|
||||||
|
- Update to 4.13.0 version (#2173897)
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 02 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.12.0-2
|
||||||
|
- Update license tag to SPDX format
|
||||||
|
|
||||||
|
* Thu Nov 10 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.12.0-1
|
||||||
|
- Update to 4.12.0 version (#2140456)
|
||||||
|
|
||||||
|
* Mon Jul 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.11.0-1
|
||||||
|
- Update to 4.11.0 version (#2110786)
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 02 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.10.0-1
|
||||||
|
- Update to 4.10.0 version (#2092413)
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 04 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.9.0-1
|
||||||
|
- Update to 4.9.0 version (#2036757)
|
||||||
|
|
||||||
|
* Fri Nov 05 2021 Parag Nemade <pnemade AT redhat DOT com> - 4.8.0-1
|
||||||
|
- Update to 4.8.0 version (#2019880)
|
||||||
|
- Adjust upstream tarball Source URL
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 08 2021 Parag Nemade <pnemade AT redhat DOT com> - 4.6.0-1
|
||||||
|
- Update to 4.6.0 version (#1936377)
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 20 2020 Parag Nemade <pnemade AT redhat DOT com> - 4.5.0-1
|
||||||
|
- Update to 4.5.0 version (#1837748)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Oct 09 2019 Parag Nemade <pnemade AT redhat DOT com> - 4.4-1
|
||||||
|
- Update to 4.4 version (#1758138)
|
||||||
|
|
||||||
|
* Fri Aug 16 2019 Parag Nemade <pnemade AT redhat DOT com> - 4.3-2
|
||||||
|
- Simple rebuilt to have f32 and f31 dist-git in sync
|
||||||
|
|
||||||
|
* Fri Aug 16 2019 Parag Nemade <pnemade AT redhat DOT com> - 4.3-1
|
||||||
|
- Update to 4.3 version (#1733770)
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
5
plans/iso-codes.fmf
Normal file
5
plans/iso-codes.fmf
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
summary: Basic smoke test
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (iso-codes-iso-codes-4.2.tar.gz) = 5bfeae2798adb409b02121bf1cbc75f12f2c1e665dcb8c6eedde6d1b964bf2274a61688a092cf646c049cb1088af13aa7ab848a778ae4d91c0f1923781ffbb2a
|
SHA512 (iso-codes-v4.20.1.tar.gz) = 2b5690b109da3d4f969c62f1a9653f6a12f6529794b97d0c834d708ff9a407bc0193047992b2acea7525f4638a68dbd9a6dceec8b0b0d08f23a2fd2e3124b1d2
|
||||||
|
|
|
||||||
7
tests/main.fmf
Normal file
7
tests/main.fmf
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
test: ./runtests.sh
|
||||||
|
duration: 10m
|
||||||
|
framework: beakerlib
|
||||||
|
require:
|
||||||
|
- iso-codes
|
||||||
|
- python3-jsonschema
|
||||||
|
- rpm-build
|
||||||
18
tests/run_test.sh
Executable file
18
tests/run_test.sh
Executable file
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/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
|
||||||
41
tests/runtests.sh
Executable file
41
tests/runtests.sh
Executable file
|
|
@ -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
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue