diff --git a/.gitignore b/.gitignore index 939d363..017ff93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/test-unit-*.gem -/test-unit-*-tests.tar.gz +/test-unit-2.1.1.gem diff --git a/rubygem-test-unit.spec b/rubygem-test-unit.spec index 1b1b0e6..3d92b61 100644 --- a/rubygem-test-unit.spec +++ b/rubygem-test-unit.spec @@ -1,41 +1,29 @@ -%global gem_name test-unit +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname test-unit +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} -# svn repository -# http://test-unit.rubyforge.org/svn/trunk/ +%global rubyabi 1.8 Summary: Improved version of Test::Unit bundled in Ruby 1.8.x -Name: rubygem-%{gem_name} -# 3.6.0 and above is for F-39+ only as 3.5.8 and above -# changes default progress style -# (For 3.5.8 and 3.5.9, F-38 and below reverted this change) -Version: 3.7.7 -Release: 1%{?dist} -# SPDX confirmed -# lib/test/unit/diff.rb is under (BSD-2-Clause OR Ruby) AND Python-2.0.1 -# lib/test-unit.rb changed to BSD-2-Clause or Ruby (from 3.3.7) -# Other file: BSD-2-Clause or Ruby -License: ((BSD-2-Clause OR Ruby) AND Python-2.0.1) AND (BSD-2-Clause OR Ruby) -URL: http://test-unit.github.io/ +Name: rubygem-%{gemname} +Version: 2.1.1 +Release: 2%{?dist} +Group: Development/Languages +# lib/test/unit/diff.rb is under GPLv2 or Ruby or Python +# Other file: GPLv2 or Ruby +License: (GPLv2 or Ruby) and (GPLv2 or Ruby or Python) +URL: http://rubyforge.org/projects/test-unit/ -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: %{gem_name}-%{version}-tests.tar.gz -# Source1 is created by bash %%SOURCE2 -Source2: test-unit-create-missing-files.sh - -BuildRequires: ruby(release) +Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem +BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygems -BuildRequires: rubygems-devel -BuildRequires: rubygem(power_assert) -# For %%check -#BuildRequires: rubygem(rake) -#BuildRequires: rubygem(hoe) -BuildRequires: rubygem(bigdecimal) -BuildRequires: rubygem(csv) -Requires: ruby(release) +BuildRequires(check): rubygem(rake) +BuildRequires(check): rubygem(hoe) +Requires: ruby(abi) = %{rubyabi} Requires: rubygems BuildArch: noarch -Provides: rubygem(%{gem_name}) = %{version}-%{release} +Provides: rubygem(%{gemname}) = %{version}-%{release} %description Test::Unit 2.x - Improved version of Test::Unit bundled in @@ -46,378 +34,82 @@ Test::Unit (Test::Unit 2.x) will be improved actively. %package doc Summary: Documentation for %{name} +Group: Documentation Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 +%setup -q -c -T -mv ../%{gem_name}-%{version}.gemspec . +mkdir -p .%{geminstdir} +gem install \ + -V \ + --local \ + --install-dir .%{gemdir} \ + --force \ + --rdoc \ + %{SOURCE0} + +find . -name \*.gem | xargs chmod 0644 + +pushd .%{geminstdir} +# rdoc gem not needed +sed -i -e '/rdoc/s|^gem|#gem|' Rakefile +popd %build -gem build %{gem_name}-%{version}.gemspec -%gem_install -cp -a %{gem_name}-%{version}/test ./%{gem_instdir} - -#find . -name \*.gem | xargs chmod 0644 -find . -type f | xargs chmod ugo+r %install -mkdir -p %{buildroot}%{gem_dir} -cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ +rm -rf %{buildroot} -rm -f %{buildroot}%{gem_cache} -# Keep undeleted the following files (now)?? -# Needs investigation -pushd %{buildroot}%{gem_instdir} -rm -rf \ - Rakefile \ - test/ \ - %{nil} -popd +mkdir -p %{buildroot}%{gemdir} +cp -a .%{gemdir}/* \ + %{buildroot}%{gemdir}/ + +# Move bin/ script to standard path +# The name "testrb" conflicts with ruby 1.8.x, rename it +mkdir -p %{buildroot}/%{_bindir} +mv %{buildroot}%{gemdir}/bin/* \ + %{buildroot}/%{_bindir}/ +rmdir %{buildroot}%{gemdir}/bin +find %{buildroot}%{geminstdir}/bin -type f | xargs chmod 0755 + +## rename!! +mv %{buildroot}%{_bindir}/testrb{,2} + +%clean +rm -rf %{buildroot} %check -pushd .%{gem_instdir} -#rake test --trace -ruby -Ilib ./test/run.rb -popd +pushd .%{geminstdir} +rake test --trace %files -%dir %{gem_instdir} -%license %{gem_instdir}/BSDL -%license %{gem_instdir}/COPYING -%license %{gem_instdir}/PSFL -%doc %{gem_instdir}/README.md +%defattr(-,root,root,-) +%dir %{geminstdir} +%doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Rakefile -%{gem_libdir} -%{gem_instdir}/bin/ -%{gem_spec} +%{_bindir}/testrb2 +%{geminstdir}/bin/ +%{geminstdir}/lib/ + +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc -%{gem_instdir}/doc/ -%{gem_instdir}/sample/ +%defattr(-,root,root,-) +%{geminstdir}/Rakefile +%{geminstdir}/html/ +%{geminstdir}/images/ +%{geminstdir}/sample/ +%{geminstdir}/test/ -%{gem_docdir}/ +%{gemdir}/doc/%{gemname}-%{version}/ %changelog -* Fri Jan 02 2026 Mamoru TASAKA - 3.7.7-1 -- 3.7.7 - -* Tue Dec 30 2025 Mamoru TASAKA - 3.7.6-1 -- 3.7.6 - -* Tue Dec 02 2025 Mamoru TASAKA - 3.7.3-1 -- 3.7.3 - -* Sun Nov 23 2025 Mamoru TASAKA - 3.7.1-1 -- 3.7.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.7.0-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jul 06 2025 Mamoru TASAKA - 3.7.0-100 -- 3.7.0 - -* Thu Apr 10 2025 Mamoru TASAKA - 3.6.8-100 -- 3.6.8 - -* Sun Jan 19 2025 Fedora Release Engineering - 3.6.7-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 09 2025 Mamoru TASAKA - 3.6.7-100 -- 3.6.7 - -* Fri Nov 01 2024 Vít Ondruch - 3.6.2-202 -- Add `rubygem(csv)` build dependency needed by Ruby 3.4 - -* Fri Jul 19 2024 Fedora Release Engineering - 3.6.2-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Feb 16 2024 Mamoru TASAKA - 3.6.2-200 -- 3.6.2 - -* Fri Jan 26 2024 Fedora Release Engineering - 3.6.1-202 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.6.1-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 27 2023 Mamoru TASAKA - 3.6.1-200 -- 3.6.1 - -* Sun Jun 11 2023 Mamoru TASAKA - 3.6.0-200 -- 3.6.0 - -* Thu May 25 2023 Mamoru TASAKA - 3.5.9-200 -- 3.5.9 - -* Sat May 13 2023 Mamoru TASAKA - 3.5.8-200 -- 3.5.8 -- F-38 and below: Keep progress style as mark as before instead of upstream-chosen - inplace style - -* Fri Jan 20 2023 Fedora Release Engineering - 3.5.7-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 15 2022 Mamoru TASAKA - 3.5.7-200 -- 3.5.7 - -* Tue Oct 4 2022 Mamoru TASAKA - 3.5.5-200 -- 3.5.5 - -* Sat Jul 23 2022 Fedora Release Engineering - 3.5.3-202 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 3.5.3-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Dec 21 2021 Mamoru TASAKA - 3.5.3-200 -- 3.5.3 - -* Fri Dec 10 2021 Mamoru TASAKA - 3.5.2-200 -- 3.5.2 - -* Wed Nov 10 2021 Mamoru TASAKA - 3.5.1-200 -- 3.5.1 - -* Tue Oct 19 2021 Mamoru TASAKA - 3.5.0-200 -- 3.5.0 - -* Tue Oct 12 2021 Mamoru TASAKA - 3.4.8-200 -- 3.4.8 - -* Wed Sep 15 2021 Mamoru TASAKA - 3.4.7-200 -- 3.4.7 - -* Sun Sep 5 2021 Mamoru TASAKA - 3.4.5-200 -- 3.4.5 - -* Fri Jul 23 2021 Fedora Release Engineering - 3.4.4-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jun 19 2021 Mamoru TASAKA - 3.4.4-200 -- 3.4.4 - -* Thu Apr 22 2021 Mamoru TASAKA - 3.4.1-200 -- 3.4.1 - -* Mon Feb 1 2021 Mamoru TASAKA - 3.4.0-200 -- 3.4.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.3.9-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 29 2020 Mamoru TASAKA - 3.3.9-200 -- 3.3.9 - -* Sat Dec 26 2020 Mamoru TASAKA - 3.3.8-200 -- 3.3.8 - -* Wed Dec 23 2020 Mamoru TASAKA - 3.3.7-201 -- Update license tag - -* Wed Nov 25 2020 Mamoru TASAKA - 3.3.7-200 -- 3.3.7 - -* Wed Jul 29 2020 Fedora Release Engineering - 3.3.6-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jun 12 2020 Mamoru TASAKA - 3.3.6-200 -- 3.3.6 - -* Thu Jan 30 2020 Fedora Release Engineering - 3.3.5-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 14 2020 Mamoru TASAKA - 3.3.5-200 -- 3.3.5 - -* Tue Oct 1 2019 Mamoru TASAKA - 3.3.4-200 -- 3.3.4 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.3.3-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 13 2019 Mamoru TASAKA - 3.3.3-200 -- 3.3.3 - -* Tue Apr 23 2019 Mamoru TASAKA - 3.3.2-200 -- 3.3.2 - -* Mon Apr 1 2019 Mamoru TASAKA - 3.3.1-200 -- 3.3.1 - -* Sat Feb 02 2019 Fedora Release Engineering - 3.3.0-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 30 2019 Mamoru TASAKA - 3.3.0-200 -- 3.3.0 - -* Fri Dec 14 2018 Mamoru TASAKA - 3.2.9-200 -- 3.2.9 - -* Sat Jul 14 2018 Fedora Release Engineering - 3.2.8-201 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 4 2018 Mamoru TASAKA - 3.2.8-200 -- 3.2.8 -- Bump release number - -* Fri Feb 09 2018 Fedora Release Engineering - 3.2.7-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Dec 27 2017 Mamoru TASAKA - 3.2.7-100 -- 3.2.7 - -* Fri Sep 22 2017 Mamoru TASAKA - 3.2.6-100 -- 3.2.6 - -* Thu Jul 27 2017 Fedora Release Engineering - 3.2.5-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 29 2017 Mamoru TASAKA - 3.2.5-100 -- 3.2.5 - -* Fri May 26 2017 Mamoru TASAKA - 3.2.4-100 -- 3.2.4 - -* Fri May 5 2017 Mamoru TASAKA - 3.2.3-103 -- Follow up power_assert 1.0.0 change - -* Thu Feb 16 2017 Mamoru TASAKA - 3.2.3-102 -- Fix test failure for ruby24 wrt integer unification - -* Sat Feb 11 2017 Fedora Release Engineering - 3.2.3-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 1 2016 Mamoru TASAKA - 3.2.3-100 -- 3.2.3 - -* Tue Nov 15 2016 Mamoru TASAKA - 3.2.2-100 -- 3.2.2 - -* Sun Jul 31 2016 Mamoru TASAKA - 3.2.1-100 -- 3.2.1 - -* Fri Jun 24 2016 Mamoru TASAKA - 3.2.0-100 -- 3.2.0 - -* Tue May 24 2016 Mamoru TASAKA - 3.1.9-100 -- 3.1.9 - -* Wed Mar 23 2016 Mamoru TASAKA - 3.1.8-100 -- 3.1.8 - -* Thu Feb 04 2016 Fedora Release Engineering - 3.1.7-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 19 2016 Mamoru TASAKA - 3.1.7-100 -- 3.1.7 - -* Mon Oct 12 2015 Mamoru TASAKA - 3.1.5-100 -- 3.1.5 - -* Mon Sep 28 2015 Mamoru TASAKA - 3.1.4-100 -- 3.1.4 - -* Mon Jul 27 2015 Mamoru TASAKA - 3.1.3-100 -- 3.1.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 3.1.2-101 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 10 2015 Mamoru TASAKA - 3.1.2-100 -- 3.1.2 - -* Fri May 29 2015 Mamoru TASAKA - 3.1.1-100 -- 3.1.1 - -* Fri May 29 2015 Mamoru TASAKA - 3.1.0-100 -- 3.1.0 - -* Tue Jan 13 2015 Mamoru TASAKA - 3.0.9-101 -- Kill 2-year-old testrb2 support on F-22+ - -* Wed Dec 29 2014 Mamoru TASAKA - 3.0.9-100 -- 3.0.9 - -* Sun Dec 14 2014 Mamoru TASAKA - 3.0.8-100 -- Bump release massively (for ruby srpm) - -* Sun Dec 14 2014 Mamoru TASAKA - 3.0.8-1 -- 3.0.8 - -* Thu Dec 4 2014 Mamoru TASAKA - 3.0.7-1 -- 3.0.7 - -* Sun Jun 08 2014 Fedora Release Engineering - 2.5.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.5.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 18 2013 Mamoru TASAKA - 2.5.5-1 -- 2.5.5 - -* Thu Feb 28 2013 Mamoru TASAKA - 2.5.4-3 -- Patch for CSV support (patch by upstream) - -* Wed Feb 27 2013 Mamoru TASAKA - 2.5.4-2 -- Rebuild for ruby 2.0.0 - -* Sun Feb 3 2013 Mamoru TASAKA - 2.5.4-1 -- 2.5.4 - -* Wed Jan 3 2013 Mamoru TASAKA - 2.5.3-1 -- 2.5.3 - -* Sat Jul 21 2012 Fedora Release Engineering - 2.4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Apr 03 2012 Bohuslav Kabrda - 2.4.5-3 -- Fix conditionals for F17 to work for RHEL 7 as well. - -* Sun Jan 22 2012 Mamoru Tasaka - 2.4.5-2 -- 2.4.5 - -* Sun Jan 15 2012 Mamoru Tasaka - 2.4.4-1 -- 2.4.4 - -* Sat Jan 14 2012 Fedora Release Engineering - 2.4.3-2 -- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Dec 18 2011 Mamoru Tasaka - 2.4.3-1 -- 2.4.3 - -* Sun Nov 27 2011 Mamoru Tasaka - 2.4.2-1 -- 2.4.2 - -* Wed Nov 16 2011 Mamoru Tasaka - 2.4.1-1 -- 2.4.1 - -* Mon Sep 19 2011 Mamoru Tasaka - 2.4.0-1 -- 2.4.0 - -* Thu Aug 18 2011 Mamoru Tasaka - 2.3.2-1 -- 2.3.2 - -* Sun Aug 14 2011 Mamoru Tasaka - 2.3.1-1 -- 2.3.1 - -* Sun Apr 24 2011 Mamoru Tasaka - 2.3.0-1 -- 2.3.0 - -* Fri Feb 18 2011 Mamoru Tasaka - 2.2.0-1 -- 2.2.0 - -* Mon Feb 14 2011 Mamoru Tasaka - 2.1.2-2 -- F-15 mass rebuild - -* Thu Nov 26 2010 Mamoru Tasaka - 2.1.2-1 -- 2.1.2 - * Sun Sep 19 2010 Mamoru Tasaka - 2.1.1-2 - Fix up license tag diff --git a/sources b/sources index cde83da..2a67ac6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (test-unit-3.7.7.gem) = a7c13693e4d9b2c55790c0f3be3f6d4c5d9c10b54664002ae9823f337e7ea69c40c0b8c2562ceb904a7c8bf08afb53358e260626f5f2b8ab0875a7664fa52d52 -SHA512 (test-unit-3.7.7-tests.tar.gz) = 8a6ead7682b259fde23d1eb6731a53463fe5a6fcedb8ead63d058214c1ff3424a5429d08aa08fadff95d21687e83770e180fa2305b174c70772c7f3fd81a7e09 +ea44337803649ebb27d8bc51ee65aad7 test-unit-2.1.1.gem diff --git a/test-unit-create-missing-files.sh b/test-unit-create-missing-files.sh deleted file mode 100644 index 3d105a1..0000000 --- a/test-unit-create-missing-files.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -if [ $# -lt 1 ] -then - echo "$0 " - exit 1 -fi - -set -x -set -e - -VERSION=$1 - -REPOURL=https://github.com/test-unit/ -REPONAME=test-unit - -TARBALLNAME=${REPONAME}-${VERSION}-tests.tar.gz - -CURRDIR=$(pwd) -TMPDIRPATH=$(mktemp -d /var/tmp/${REPONAME}-tar-XXXXXX) -pushd $TMPDIRPATH - -git clone ${REPOURL}/${REPONAME}.git -ln -sf ${REPONAME} ${REPONAME}-${VERSION} -cd ${REPONAME} - -git checkout -b fedora-${VERSION} ${VERSION} -cd .. -tar czf $TARBALLNAME ${REPONAME}-${VERSION}/test -mv $TARBALLNAME $CURRDIR - -popd -rm -rf $TMPDIRPATH - -