diff --git a/.gitignore b/.gitignore index a552fd4..2bdccad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/unf-*.gem -/unf-*-test-missing-files.tar.gz +/unf-0.1.2.gem +/unf-0.1.3.gem +/unf-0.1.4.gem diff --git a/rubygem-unf.spec b/rubygem-unf.spec index 595682d..1048f85 100644 --- a/rubygem-unf.spec +++ b/rubygem-unf.spec @@ -1,26 +1,36 @@ %global gem_name unf +%if ! (0%{?fedora} >= 19 || 0%{?rhel} >= 9) +%global rubyabi 1.9.1 +%endif %undefine __brp_mangle_shebangs 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: 20%{?dist} -# SPDX confirmed -License: BSD-2-Clause +License: BSD 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 +%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) +BuildRequires: rubygem(minitest) +BuildRequires: rubygem(shoulda) BuildRequires: rubygem(unf_ext) -BuildRequires: rubygem(rake) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -38,17 +48,23 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 -mv ../%{gem_name}-%{version}.gemspec . +%setup -q -c -T + +TOPDIR=$(pwd) +mkdir tmpunpackdir +pushd tmpunpackdir + +gem unpack %{SOURCE0} +cd %{gem_name}-%{version} + +gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec +gem build %{gem_name}.gemspec +mv %{gem_name}-%{version}.gem $TOPDIR + +popd +rm -rf tmpunpackdir %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 %install @@ -56,13 +72,11 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -rm -f %{buildroot}%{gem_cache} pushd %{buildroot}%{gem_instdir} rm -rf \ Gemfile \ Rakefile \ *.gemspec \ - .github/ \ .gitignore \ .travis.yml \ test/ \ @@ -71,15 +85,23 @@ popd %check -rm -rf .%{gem_instdir}/test/ -cp -a ./test/ .%{gem_instdir} - pushd .%{gem_instdir} sed -i.orig \ -e '/begin/,/end/d' \ -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 @@ -88,44 +110,16 @@ popd %files %dir %{gem_instdir} -%doc %{gem_instdir}/[A-KM-Z]* -%license %{gem_instdir}/LICENSE +%doc %{gem_instdir}/[A-Z]* %{gem_libdir}/ +%exclude %{gem_cache} %{gem_spec} %files doc %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 - -* Wed Sep 6 2023 Mamoru TASAKA - 0.1.4-23 -- Massive spec file cleanup -- SPDX migration - -* 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 - -* Fri Jan 20 2023 Fedora Release Engineering - 0.1.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Sat Jul 23 2022 Fedora Release Engineering - 0.1.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index b5e07a0..3804a3f 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 +64009f92a131c50bc1a932dc50d562c6 unf-0.1.4.gem 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 -