diff --git a/.gitignore b/.gitignore index ced473c..2204975 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -xml-simple-1.0.12.gem -/xml-simple-1.1.2.gem -/xml-simple-1.1.5.gem -/xml-simple-tests.tar.gz +/xml-simple-*.gem +/xml-simple-tests-*.tar.gz diff --git a/create-xml-simple-test-suite.sh b/create-xml-simple-test-suite.sh new file mode 100644 index 0000000..dcb033c --- /dev/null +++ b/create-xml-simple-test-suite.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=xml-simple +GITURL=https://github.com/maik/${REPONAME}.git + +VERSION=${VERSION:-1.1.9} +GITHASH=${GITHASH:-7b8bdf7b33ab872bb4d1fb8eeecba5c5e1a4a421} + +TESTTARBALL=${REPONAME}-tests-${VERSION}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) +pushd $TMPDIR + +git clone $GITURL +cd ${REPONAME} + +git checkout -b fedora-${VERSION} ${GITHASH} +tar czf $TESTTARBALL test/ +cp -a $TESTTARBALL $PWDDIR +cd .. + +popd +rm -rf $TMPDIR + diff --git a/rubygem-xml-simple.spec b/rubygem-xml-simple.spec index 92b1fef..774c582 100644 --- a/rubygem-xml-simple.spec +++ b/rubygem-xml-simple.spec @@ -1,72 +1,127 @@ -%global gem_name xml-simple +%global gem_name xml-simple -Name: rubygem-%{gem_name} -Version: 1.1.5 -Release: 9%{?dist} -Summary: A simple API for XML processing -License: Ruby -URL: https://github.com/maik/xml-simple -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# git clone https://github.com/maik/xml-simple.git -# cd xml-simple; tar -czf xml-simple-tests.tar.gz test -Source1: %{gem_name}-tests.tar.gz -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby +# 1.1.9 is from ruby 3.0 only +Name: rubygem-%{gem_name} +Version: 1.1.9 +Release: 10%{?dist} + +Summary: A simple API for XML processing +License: MIT + +URL: https://github.com/maik/xml-simple +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: %{gem_name}-tests-%{version}.tar.gz +# Source1 is created from $ bash %%SOURCE2 +Source2: create-xml-simple-test-suite.sh + +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby +BuildRequires: rubygem(rexml) # tests -BuildRequires: rubygem(test-unit) +BuildRequires: rubygem(test-unit) -BuildArch: noarch +BuildArch: noarch %description A simple API for XML processing. -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc Documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{gem_name}-%{version} - -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} -a 1 +mv ../%{gem_name}-%{version}.gemspec . %build -gem build %{gem_name}.gemspec +gem build %{gem_name}-%{version}.gemspec %gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ - + %{buildroot}%{gem_dir}/ %check +cp -a test .%{gem_instdir} pushd .%{gem_instdir} -tar -xzf %{SOURCE1} +# Sometimes we see: +# Error: test_perl_test_cases(TC_Perl_Mem_Copy): RuntimeError: Time moved backwards! +# Error: test_perl_test_cases(TC_Perl_Mem_Share): RuntimeError: Time moved backwards! +# See: https://apenwarr.ca/log/20181113 +grep -l backwards test/tc_*.rb | \ + xargs sed -i '\@backwards@s|raise|#raise|' + # passing nil to xml_in makes it search for the ruby script being run ruby -Ilib test/tc_perl_in.rb -rm test/tc_perl_in.rb +mv test/tc_perl_in.rb{,.bak} ruby -Ilib -e 'Dir.glob "./test/*.rb", &method(:require)' +mv test/tc_perl_in.rb{.bak,} popd %files -%dir %{gem_instdir} +%dir %{gem_instdir} %{gem_libdir} %exclude %{gem_cache} %{gem_spec} %files doc -%doc %{gem_docdir} +%doc %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.1.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 1.1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 1.1.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Apr 17 2023 Mamoru TASAKA - 1.1.9-5 +- Fix tests which sometimes fail randomly due to generic mtime() resolution + issue + +* Fri Jan 20 2023 Fedora Release Engineering - 1.1.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 7 2021 Mamoru TASAKA - 1.1.9-1 +- 1.1.9 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 30 2021 Mamoru TASAKA - 1.1.8-1 +- 1.1.8 + +* Mon Mar 29 2021 Mamoru TASAKA - 1.1.5-12 +- Add dependency for rubygem(rexml) + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 1.1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 31f7724..2a4c124 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xml-simple-1.1.5.gem) = 30b8e9541d4047181df34f3558235aa2058f8fda26220a90bc811b3f438130a69d06c72b52ba4fe5caadf779195d3bf772253bdb70db5df238f5117c7362e97f -SHA512 (xml-simple-tests.tar.gz) = d70352ca4e962ae97fb38f9d426e79f2db6e7623620a740570e0f2e83db2e53177d44dbc3ac437b09aef9cccee63d79d1d668ca94cba7ef0c4c23ec61e154d82 +SHA512 (xml-simple-1.1.9.gem) = cdc7a8d62fb006a1c8a895bbd8b0c64d912bc4475bdcce167ee34edb039269b087109e191979b4d7f14333eb4cc1a93bf74be849d8bf6eeb83075b2a9b1752e9 +SHA512 (xml-simple-tests-1.1.9.tar.gz) = 27e96676247ccb0778f3d24c0a042070858b7f23c0f33f8872a0154684e0a1704b782af754e0e131112a6245cf8afc4f27f0340173cdacef89ba3918beb37c7d