From d76ff1f9d2423988c96c62ad6d2c1543922f3848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 5 Sep 2023 09:59:38 +0200 Subject: [PATCH 01/10] Drop rubygem-shoulda dependency and use Test::Unit for testing. --- rubygem-unf-0.2.0-Use-test-unit-.patch | 41 ++++++++++++++++++++++++++ rubygem-unf.spec | 27 ++++++++--------- 2 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 rubygem-unf-0.2.0-Use-test-unit-.patch diff --git a/rubygem-unf-0.2.0-Use-test-unit-.patch b/rubygem-unf-0.2.0-Use-test-unit-.patch new file mode 100644 index 0000000..506d1ef --- /dev/null +++ b/rubygem-unf-0.2.0-Use-test-unit-.patch @@ -0,0 +1,41 @@ +From c3987f7942bdde5268ec293834ba3b3447217752 Mon Sep 17 00:00:00 2001 +From: Akinori MUSHA +Date: Thu, 16 Apr 2015 12:17:01 +0900 +Subject: [PATCH] Use test-unit. + +--- + test/helper.rb | 1 - + test/test_unf.rb | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/test/helper.rb b/test/helper.rb +index 7321a5a..6b21ea5 100644 +--- a/test/helper.rb ++++ b/test/helper.rb +@@ -8,7 +8,6 @@ + exit e.status_code + end + require 'test/unit' +-require 'shoulda' + + $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) + $LOAD_PATH.unshift(File.dirname(__FILE__)) +diff --git a/test/test_unf.rb b/test/test_unf.rb +index b71e5a0..5281033 100644 +--- a/test/test_unf.rb ++++ b/test/test_unf.rb +@@ -3,12 +3,12 @@ + require 'pathname' + + class TestUNF < Test::Unit::TestCase +- should "raise ArgumentError if an unknown normalization form is given" do ++ test "raise ArgumentError if an unknown normalization form is given" do + normalizer = UNF::Normalizer.instance + assert_raises(ArgumentError) { normalizer.normalize("が", :nfck) } + end + +- should "pass all tests bundled with the original unf" do ++ test "pass all tests bundled with the original unf" do + normalizer = UNF::Normalizer.instance + open(Pathname(__FILE__).dirname + 'normalization-test.txt', 'r:utf-8').each_slice(6) { |lines| + flunk "broken test file" if lines.size != 6 || lines.pop !~ /^$/ diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 638ac2f..798e4a1 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -8,11 +8,14 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} Version: 0.1.4 -Release: 22%{?dist} +Release: 23%{?dist} License: BSD URL: https://github.com/knu/ruby-unf Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +# Drop Shoulda dependency to reduce the dependency chain. +# https://github.com/knu/ruby-unf/commit/c3987f7942bdde5268ec293834ba3b3447217752 +Patch0: rubygem-unf-0.2.0-Use-test-unit-.patch %if 0%{?fedora} >= 19 || 0%{?rhel} >= 9 Requires: ruby(release) @@ -28,8 +31,7 @@ Requires: ruby(rubygems) Requires: rubygem(unf_ext) BuildRequires: rubygems-devel # %%check -BuildRequires: rubygem(minitest) -BuildRequires: rubygem(shoulda) +BuildRequires: rubygem(test-unit) BuildRequires: rubygem(unf_ext) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -58,6 +60,11 @@ gem unpack %{SOURCE0} cd %{gem_name}-%{version} gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec + +%patch 0 -p1 +%gemspec_remove_dep -s %{gem_name}.gemspec -g shoulda -d ">= 0" +%gemspec_add_dep -s %{gem_name}.gemspec -g test-unit -d + gem build %{gem_name}.gemspec mv %{gem_name}-%{version}.gem $TOPDIR @@ -91,17 +98,6 @@ sed -i.orig \ -e '/bundler/d' \ test/helper.rb -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 9 -sed -i.minitest \ - -e 's|Test::Unit::TestCase|Minitest::Test|' \ - test/*.rb -cat > test/unit.rb << EOF -gem "minitest" -require "minitest/autorun" -EOF - -%endif - for f in test/test_*.rb do ruby -Ilib:test:. $f @@ -120,6 +116,9 @@ popd %doc %{gem_docdir} %changelog +* Tue Sep 05 2023 Vít Ondruch - 0.1.4-23 +- Drop rubygem-shoulda dependency and use Test::Unit for testing. + * Fri Jul 21 2023 Fedora Release Engineering - 0.1.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e05ffefb7838362d43e64f4ef08f91939c5a5bc4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Sep 2023 17:54:17 +0900 Subject: [PATCH 02/10] spec file cleanup --- rubygem-unf.spec | 51 +++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 798e4a1..785a84d 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -1,7 +1,4 @@ %global gem_name unf -%if ! (0%{?fedora} >= 19 || 0%{?rhel} >= 9) -%global rubyabi 1.9.1 -%endif %undefine __brp_mangle_shebangs @@ -17,18 +14,7 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem # https://github.com/knu/ruby-unf/commit/c3987f7942bdde5268ec293834ba3b3447217752 Patch0: rubygem-unf-0.2.0-Use-test-unit-.patch -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 9 -Requires: ruby(release) BuildRequires: ruby(release) -%else -Requires: ruby(abi) = %{rubyabi} -Requires: ruby -BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby -%endif - -Requires: ruby(rubygems) -Requires: rubygem(unf_ext) BuildRequires: rubygems-devel # %%check BuildRequires: rubygem(test-unit) @@ -50,28 +36,15 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T +%setup -q -n %{gem_name}-%{version} +mv ../%{gem_name}-%{version}.gemspec . -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - -gem unpack %{SOURCE0} -cd %{gem_name}-%{version} - -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec - -%patch 0 -p1 -%gemspec_remove_dep -s %{gem_name}.gemspec -g shoulda -d ">= 0" -%gemspec_add_dep -s %{gem_name}.gemspec -g test-unit -d - -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir +%patch -P0 -p1 +%gemspec_remove_dep -s %{gem_name}-%{version}.gemspec -g shoulda -d ">= 0" +%gemspec_add_dep -s %{gem_name}-%{version}.gemspec -g test-unit -d %build +gem build ./%{gem_name}-%{version}.gemspec %gem_install %install @@ -79,6 +52,7 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ +rm -f %{buildroot}%{gem_cache} pushd %{buildroot}%{gem_instdir} rm -rf \ Gemfile \ @@ -106,18 +80,21 @@ popd %files %dir %{gem_instdir} -%doc %{gem_instdir}/[A-Z]* +%doc %{gem_instdir}/[A-KM-Z]* +%license %{gem_instdir}/LICENSE %{gem_libdir}/ -%exclude %{gem_cache} %{gem_spec} %files doc %doc %{gem_docdir} %changelog -* Tue Sep 05 2023 Vít Ondruch - 0.1.4-23 -- Drop rubygem-shoulda dependency and use Test::Unit for testing. +* Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-22 +- Massive spec file cleanup + +* Tue Sep 05 2023 Vít Ondruch +- Drop rubygem-shoulda dependency and use Test::Unit for testing * Fri Jul 21 2023 Fedora Release Engineering - 0.1.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a2becf4c018fede06f6de2636e75f4ae799cf23d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Sep 2023 17:54:43 +0900 Subject: [PATCH 03/10] gitignore cleanup --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2bdccad..c3b3f5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/unf-0.1.2.gem -/unf-0.1.3.gem -/unf-0.1.4.gem +/unf-*.gem From 63a6abf613635f4355b7f21119d6bb8c853fdef5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Sep 2023 17:56:46 +0900 Subject: [PATCH 04/10] SPDX migration --- rubygem-unf.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 785a84d..4710719 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -7,7 +7,8 @@ Name: rubygem-%{gem_name} Version: 0.1.4 Release: 23%{?dist} -License: BSD +# SPDX confirmed +License: BSD-2-Clause URL: https://github.com/knu/ruby-unf Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem # Drop Shoulda dependency to reduce the dependency chain. @@ -92,6 +93,7 @@ popd %changelog * Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-22 - Massive spec file cleanup +- SPDX migration * Tue Sep 05 2023 Vít Ondruch - Drop rubygem-shoulda dependency and use Test::Unit for testing From 066f7e2bd0adfa9287f367939fb0e0bb42a2b790 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Sep 2023 17:58:10 +0900 Subject: [PATCH 05/10] fix changelog --- rubygem-unf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 4710719..cf09e12 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -91,7 +91,7 @@ popd %doc %{gem_docdir} %changelog -* Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-22 +* Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-23 - Massive spec file cleanup - SPDX migration From 6b5617a44a90a6057b0087fdc59cb7f125edc30c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:42:25 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-unf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index cf09e12..735d1c4 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -5,7 +5,7 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} Version: 0.1.4 -Release: 23%{?dist} +Release: 24%{?dist} # SPDX confirmed License: BSD-2-Clause @@ -91,6 +91,9 @@ popd %doc %{gem_docdir} %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.1.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-23 - Massive spec file cleanup - SPDX migration From 96ef347ebcbc662d5092dae771f5c6e33108188a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 20:08:48 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-unf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 735d1c4..a9322ab 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -5,7 +5,7 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} Version: 0.1.4 -Release: 24%{?dist} +Release: 25%{?dist} # SPDX confirmed License: BSD-2-Clause @@ -91,6 +91,9 @@ popd %doc %{gem_docdir} %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.1.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 0.1.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e7c35a75856dc771cd0f703d8e24d49b8eefae28 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 23 Aug 2024 10:51:50 +0900 Subject: [PATCH 08/10] 0.2.0 0.2.0 --- .gitignore | 1 + rubygem-unf-0.2.0-Use-test-unit-.patch | 41 -------------------------- rubygem-unf.spec | 30 ++++++++++++------- sources | 3 +- unf-create-missing-test-files.sh | 30 +++++++++++++++++++ 5 files changed, 53 insertions(+), 52 deletions(-) delete mode 100644 rubygem-unf-0.2.0-Use-test-unit-.patch create mode 100644 unf-create-missing-test-files.sh diff --git a/.gitignore b/.gitignore index c3b3f5d..a552fd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /unf-*.gem +/unf-*-test-missing-files.tar.gz diff --git a/rubygem-unf-0.2.0-Use-test-unit-.patch b/rubygem-unf-0.2.0-Use-test-unit-.patch deleted file mode 100644 index 506d1ef..0000000 --- a/rubygem-unf-0.2.0-Use-test-unit-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c3987f7942bdde5268ec293834ba3b3447217752 Mon Sep 17 00:00:00 2001 -From: Akinori MUSHA -Date: Thu, 16 Apr 2015 12:17:01 +0900 -Subject: [PATCH] Use test-unit. - ---- - test/helper.rb | 1 - - test/test_unf.rb | 4 ++-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/test/helper.rb b/test/helper.rb -index 7321a5a..6b21ea5 100644 ---- a/test/helper.rb -+++ b/test/helper.rb -@@ -8,7 +8,6 @@ - exit e.status_code - end - require 'test/unit' --require 'shoulda' - - $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) - $LOAD_PATH.unshift(File.dirname(__FILE__)) -diff --git a/test/test_unf.rb b/test/test_unf.rb -index b71e5a0..5281033 100644 ---- a/test/test_unf.rb -+++ b/test/test_unf.rb -@@ -3,12 +3,12 @@ - require 'pathname' - - class TestUNF < Test::Unit::TestCase -- should "raise ArgumentError if an unknown normalization form is given" do -+ test "raise ArgumentError if an unknown normalization form is given" do - normalizer = UNF::Normalizer.instance - assert_raises(ArgumentError) { normalizer.normalize("が", :nfck) } - end - -- should "pass all tests bundled with the original unf" do -+ test "pass all tests bundled with the original unf" do - normalizer = UNF::Normalizer.instance - open(Pathname(__FILE__).dirname + 'normalization-test.txt', 'r:utf-8').each_slice(6) { |lines| - flunk "broken test file" if lines.size != 6 || lines.pop !~ /^$/ diff --git a/rubygem-unf.spec b/rubygem-unf.spec index a9322ab..02e09d3 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -4,22 +4,23 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} -Version: 0.1.4 -Release: 25%{?dist} +Version: 0.2.0 +Release: 1%{?dist} # SPDX confirmed License: BSD-2-Clause URL: https://github.com/knu/ruby-unf Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# Drop Shoulda dependency to reduce the dependency chain. -# https://github.com/knu/ruby-unf/commit/c3987f7942bdde5268ec293834ba3b3447217752 -Patch0: rubygem-unf-0.2.0-Use-test-unit-.patch +Source1: unf-%{version}-test-missing-files.tar.gz +# Source1 is generated by the below +Source2: unf-create-missing-test-files.sh BuildRequires: ruby(release) BuildRequires: rubygems-devel # %%check BuildRequires: rubygem(test-unit) BuildRequires: rubygem(unf_ext) +BuildRequires: rubygem(rake) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -37,14 +38,16 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . -%patch -P0 -p1 -%gemspec_remove_dep -s %{gem_name}-%{version}.gemspec -g shoulda -d ">= 0" -%gemspec_add_dep -s %{gem_name}-%{version}.gemspec -g test-unit -d - %build +# nuke unneeded ext/ directory +sed -i ./%{gem_name}-%{version}.gemspec \ + -e '\@s.extensions@d' \ + -e '\@s.files@s|"ext/[^ \t][^ \t]*||' \ + %{nil} + gem build ./%{gem_name}-%{version}.gemspec %gem_install @@ -59,6 +62,7 @@ rm -rf \ Gemfile \ Rakefile \ *.gemspec \ + .github/ \ .gitignore \ .travis.yml \ test/ \ @@ -67,6 +71,9 @@ popd %check +rm -rf .%{gem_instdir}/test/ +cp -a ./test/ .%{gem_instdir} + pushd .%{gem_instdir} sed -i.orig \ -e '/begin/,/end/d' \ @@ -91,6 +98,9 @@ popd %doc %{gem_docdir} %changelog +* Wed Aug 21 2024 Mamoru TASAKA - 0.2.0-1 +- 0.2.0 + * Fri Jul 19 2024 Fedora Release Engineering - 0.1.4-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 2fcad85..b5e07a0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (unf-0.1.4.gem) = a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b +SHA512 (unf-0.2.0.gem) = 916863d31313ef6d87c9b4d3d14dec51d764132589c838347e08a57a09ca97419fe4e9a00cced1ffb6083f106a7736217c72029dd3946c756c09b4f3b5355b48 +SHA512 (unf-0.2.0-test-missing-files.tar.gz) = 8abfa8b5d02a56033e3797e0ccee0be2ddb342e25174e48b8e67f8698a43107881ffb97aea8057ef9ca44b6332be24524c9fa0a08da7154600f839c68fa4141f diff --git a/unf-create-missing-test-files.sh b/unf-create-missing-test-files.sh new file mode 100644 index 0000000..c021067 --- /dev/null +++ b/unf-create-missing-test-files.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +usage() { + echo "$0 " +} + +set -e +set -x + +if [ $# -lt 1 ] ; then + usage + exit 1 +fi + +VERSION=$1 + +TMPDIR=$(mktemp -d /tmp/unf-XXXXXX) +CURDIR=$(pwd) + +pushd $TMPDIR + +git clone https://github.com/knu/ruby-unf.git unf +cd unf/ + +git reset --hard v$VERSION +tar czf $CURDIR/unf-${VERSION}-test-missing-files.tar.gz test/ + +popd +rm -rf $TMPDIR + From e82599ac0be79e0076aaa425b75b0ffbd668c6df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 00:13:18 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-unf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 02e09d3..2737cb9 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -5,7 +5,7 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} # SPDX confirmed License: BSD-2-Clause @@ -98,6 +98,9 @@ popd %doc %{gem_docdir} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 21 2024 Mamoru TASAKA - 0.2.0-1 - 0.2.0 From 57f57209b0488bb38f231063341d6f9dbe172940 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:53:25 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-unf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 2737cb9..595682d 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -5,7 +5,7 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} # SPDX confirmed License: BSD-2-Clause @@ -98,6 +98,9 @@ popd %doc %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild