diff --git a/.gitignore b/.gitignore index a552fd4..c3b3f5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /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 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 595682d..735d1c4 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -4,23 +4,22 @@ Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby Name: rubygem-%{gem_name} -Version: 0.2.0 -Release: 3%{?dist} +Version: 0.1.4 +Release: 24%{?dist} # SPDX confirmed License: BSD-2-Clause URL: https://github.com/knu/ruby-unf Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: unf-%{version}-test-missing-files.tar.gz -# Source1 is generated by the below -Source2: unf-create-missing-test-files.sh +# 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 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} @@ -38,16 +37,14 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 +%setup -q -n %{gem_name}-%{version} mv ../%{gem_name}-%{version}.gemspec . -%build -# nuke unneeded ext/ directory -sed -i ./%{gem_name}-%{version}.gemspec \ - -e '\@s.extensions@d' \ - -e '\@s.files@s|"ext/[^ \t][^ \t]*||' \ - %{nil} +%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 @@ -62,7 +59,6 @@ rm -rf \ Gemfile \ Rakefile \ *.gemspec \ - .github/ \ .gitignore \ .travis.yml \ test/ \ @@ -71,9 +67,6 @@ popd %check -rm -rf .%{gem_instdir}/test/ -cp -a ./test/ .%{gem_instdir} - pushd .%{gem_instdir} sed -i.orig \ -e '/begin/,/end/d' \ @@ -98,18 +91,6 @@ 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 - -* 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 - * Fri Jan 26 2024 Fedora Release Engineering - 0.1.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index b5e07a0..2fcad85 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (unf-0.2.0.gem) = 916863d31313ef6d87c9b4d3d14dec51d764132589c838347e08a57a09ca97419fe4e9a00cced1ffb6083f106a7736217c72029dd3946c756c09b4f3b5355b48 -SHA512 (unf-0.2.0-test-missing-files.tar.gz) = 8abfa8b5d02a56033e3797e0ccee0be2ddb342e25174e48b8e67f8698a43107881ffb97aea8057ef9ca44b6332be24524c9fa0a08da7154600f839c68fa4141f +SHA512 (unf-0.1.4.gem) = a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b diff --git a/unf-create-missing-test-files.sh b/unf-create-missing-test-files.sh deleted file mode 100644 index c021067..0000000 --- a/unf-create-missing-test-files.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/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 -