Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

10 changed files with 267 additions and 11 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

79
.gitignore vendored
View File

@ -1 +1,78 @@
SOURCES/iso-codes-iso-codes-3.79.tar.gz
iso-codes-3.18.tar.bz2
iso-codes-3.19.tar.bz2
/sources
/iso-codes-3.20.tar.bz2
/iso-codes-3.21.tar.bz2
/iso-codes-3.22.tar.bz2
/iso-codes-3.23.tar.bz2
/iso-codes-3.24.tar.bz2
/iso-codes-3.24.1.tar.bz2
/iso-codes-3.24.2.tar.bz2
/iso-codes-3.25.tar.bz2
/iso-codes-3.25.1.tar.bz2
/iso-codes-3.27.tar.gz
/iso-codes-3.27.1.tar.gz
/iso-codes-3.28.tar.gz
/iso-codes-3.29.tar.gz
/iso-codes-3.30.tar.bz2
/iso-codes-3.31.tar.bz2
/iso-codes-3.32.tar.bz2
/iso-codes-3.32.1.tar.bz2
/iso-codes-3.32.2.tar.bz2
/iso-codes-3.33.tar.bz2
/iso-codes-3.35.tar.bz2
/iso-codes-3.36.tar.bz2
/iso-codes-3.37.tar.bz2
/iso-codes-3.39.tar.xz
/iso-codes-3.40.tar.xz
/iso-codes-3.41.tar.xz
/iso-codes-3.42.tar.xz
/iso-codes-3.43.tar.xz
/iso-codes-3.44.tar.xz
/iso-codes-3.45.tar.xz
/iso-codes-3.46.tar.xz
/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

View File

@ -1 +0,0 @@
cdecf421032bfd0ac22bee82a60aa6157d4935ab SOURCES/iso-codes-iso-codes-3.79.tar.gz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,13 +1,14 @@
Name: iso-codes
Summary: ISO code lists and translations
Version: 3.79
Release: 2%{?dist}
License: LGPLv2+
Version: 4.16.0
Release: 6%{?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/%{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: python3-devel
BuildRequires: python3
BuildRequires: make
BuildArch: noarch
# for /usr/share/xml
@ -27,7 +28,11 @@ This package contains the pkg-config files for development
when building programs that use %{name}.
%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
%configure
@ -39,7 +44,7 @@ when building programs that use %{name}.
%find_lang %{name} --all-name
%files -f %{name}.lang
%doc ChangeLog README.md
%doc CHANGELOG.md README.md
%license COPYING
%dir %{_datadir}/xml/iso-codes
%{_datadir}/xml/iso-codes/*.xml
@ -49,8 +54,104 @@ when building programs that use %{name}.
%{_datadir}/pkgconfig/iso-codes.pc
%changelog
* Tue Aug 14 2018 Parag Nemade <pnemade AT redhat DOT com> - 3.79-2
- Resolves:rh#1615536: iso-codes FTBFS for missing BR:python3-devel
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.16.0-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Jul 12 2024 Parag Nemade <pnemade AT redhat DOT com> - 4.16.0-5
- Resolves: RHEL-46910 - Fix xmllint error for iso_3166-2.xml file
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.16.0-4
- Bump release for June 2024 mass rebuild
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Parag Nemade <pnemade AT redhat DOT com> - 4.2-1
- Update to 4.2 version (#1669653)
* Fri Dec 14 2018 Parag Nemade <pnemade AT redhat DOT com> - 4.1-1
- Update to 4.1 version (#1659319)
- Upstream moved ChangeLog to ChangeLog.md
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.79-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed May 16 2018 Parag Nemade <pnemade AT redhat DOT com> - 3.79-1
- Update to 3.79 version (#1577820)

5
plans/iso-codes.fmf Normal file
View File

@ -0,0 +1,5 @@
summary: Basic smoke test
discover:
how: fmf
execute:
how: tmt

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (iso-codes-v4.16.0.tar.gz) = 04d93eb37ff309c850a1af6d4cf6bb92a16e25ee35ee12e16325f6e7b476ba40bbf5d11e2f4c425111220480911b1dbc9e244189ea7487f1f0ea4dbce2307c96

7
tests/main.fmf Normal file
View 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
View 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
View 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}-${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