Compare commits

..

No commits in common. "rawhide" and "f25" have entirely different histories.

6 changed files with 106 additions and 294 deletions

42
.gitignore vendored
View file

@ -1,2 +1,40 @@
/gio2-*.gem
/gio2-*-test-missing-files.tar.gz
/gio2-0.90.4.gem
/gio2-0.90.5.gem
/gio2-0.90.7.gem
/gio2-0.90.8.gem
/gio2-0.90.9.gem
/gio2-1.0.0.gem
/gio2-1.0.3.gem
/gio2-1.1.1.gem
/gio2-1.1.2.gem
/gio2-1.1.3.gem
/gio2-1.1.4.gem
/gio2-1.1.5.gem
/gio2-1.1.6.gem
/gio2-1.1.9.gem
/gio2-1.2.0.gem
/gio2-1.2.1.gem
/gio2-1.2.3.gem
/gio2-1.2.4.gem
/gio2-1.2.5.gem
/gio2-1.2.6.gem
/gio2-2.0.2.gem
/gio2-2.1.0.gem
/gio2-2.2.0.gem
/gio2-2.2.3.gem
/gio2-2.2.4.gem
/gio2-2.2.5.gem
/gio2-3.0.4.gem
/gio2-3.0.4-test-missing-files.tar.gz
/gio2-3.0.5.gem
/gio2-3.0.5-test-missing-files.tar.gz
/gio2-3.0.7.gem
/gio2-3.0.7-test-missing-files.tar.gz
/gio2-3.0.8.gem
/gio2-3.0.8-test-missing-files.tar.gz
/gio2-3.0.9.gem
/gio2-3.0.9-test-missing-files.tar.gz
/gio2-3.1.0.gem
/gio2-3.1.0-test-missing-files.tar.gz
/gio2-3.1.1.gem
/gio2-3.1.1-test-missing-files.tar.gz

View file

@ -22,7 +22,7 @@ pushd $TMPDIR
git clone https://github.com/ruby-gnome2/ruby-gnome2.git
cd ruby-gnome2/
git reset --hard $VERSION || true
git reset --hard $VERSION
tar czf $CURDIR/gio2-${VERSION}-test-missing-files.tar.gz gio2/test/fixture/
popd

View file

@ -0,0 +1,11 @@
--- gio2-3.1.0/test/test-file.rb.debug 2016-11-29 15:46:48.185008989 +0900
+++ gio2-3.1.0/test/test-file.rb 2016-11-29 15:57:53.859681592 +0900
@@ -24,7 +24,7 @@
path = fixture_path("content-type", "x-content", "unix-software")
dir = Gio::File.path(path)
assert_equal(["x-content/unix-software"],
- dir.guess_content_types.collect(&:to_s))
+ dir.guess_content_types.collect(&:to_s).uniq)
end
end
end

View file

@ -0,0 +1,26 @@
commit f9bb159674c4eb25f99550fa8594fcbf97ed8cae
Author: Kouhei Sutou <kou@clear-code.com>
Date: Mon Jan 30 23:09:31 2017 +0900
gio2 test: fix path
GitHub: fix #990
Reported by Mamoru TASAKA. Thanks!!!
diff --git a/gio2/test/test-settings.rb b/gio2/test/test-settings.rb
index b16341c..5a287f1 100644
--- a/gio2/test/test-settings.rb
+++ b/gio2/test/test-settings.rb
@@ -108,7 +108,10 @@ string='new-string'
need_keyfile_settings_backend
keyfile = Tempfile.new(["settings", ".ini"])
backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings")
- schema_source = Gio::SettingsSchemaSource.new(fixture_path("schema"), nil, true)
+ schema_dir = fixture_path("schema", "default")
+ schema_source = Gio::SettingsSchemaSource.new(schema_dir,
+ nil,
+ true)
schema = schema_source.lookup("jp.ruby-gnome2.test.settings", true)
settings = Gio::Settings.new(schema,
backend,

View file

@ -1,28 +1,29 @@
%global header_dir %{ruby_vendorarchdir}
%global glibminver 3.0.9
%global glibminver 3.0.8
%global obsoleteevr 0.90.7-1.999
%global gem_name gio2
%undefine _changelog_trimtime
Summary: Ruby binding of gio-2.0.x
Name: rubygem-%{gem_name}
Version: 4.3.4
Version: 3.1.1
Release: 2%{?dist}
# SPDX confirmed
# LGPL-2.1-or-later: gemspec
License: LGPL-2.1-or-later
Group: Development/Languages
# from README
License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
# FIXME
Source1: gio2-%{version}-test-missing-files.tar.gz
# Source1 is generated by the below
Source2: gio2-create-missing-test-files.sh
Patch0: rubygem-gio2-3.1.0-test-content-dup.patch
# https://github.com/ruby-gnome2/ruby-gnome2/issues/990
# https://github.com/ruby-gnome2/ruby-gnome2/commit/f9bb159674c4eb25f99550fa8594fcbf97ed8cae
Patch1: rubygem-gio2-3.1.1-test-fix-schemas.patch
Requires: ruby(release)
BuildRequires: gcc
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: rubygem-glib2-devel >= %{glibminver}
@ -30,7 +31,6 @@ BuildRequires: rubygem-gobject-introspection-devel >= %{glibminver}
BuildRequires: ruby-devel
# For Patch0:
#BuildRequires: rubygem(rake-compiler)
BuildRequires: rubygem(fiddle)
BuildRequires: rubygem(test-unit)
BuildRequires: rubygem(test-unit-notify)
BuildRequires: rubygem(rake)
@ -51,6 +51,7 @@ Ruby/GIO2 is a Ruby binding of gio-2.0.x.
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc
@ -58,6 +59,7 @@ This package contains documentation for %{name}.
%package devel
Summary: Ruby/GIO2 development environment
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: ruby-devel
# Obsoletes / Provides
@ -69,20 +71,15 @@ Header files and libraries for building a extension library for the
rubygem-%{gem_name}
%prep
%setup -q -n %{gem_name}-%{version}
mv ../%{gem_name}-%{version}.gemspec .
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
# Allow ruby-gnome2 no less than ones
sed -i -e 's|= 4\.3\.4|>= 4.3.4|' %{gem_name}-%{version}.gemspec
sed -i -e 's|= 3\.1\.1|>= 3.1.1|' %{gem_name}.gemspec
# Remove unneeded rake runtime dependency
sed -i %{gem_name}-%{version}.gemspec \
-e '\@add_runtime_dependency.*rake@d'
# fiddle is in default gem
sed -i -e '\@dependency.*fiddle@d' %{gem_name}-%{version}.gemspec
#%%patch0 -p1
%patch0 -p1
%patch1 -p2
# Fix up Rakefile for "gnome2-raketask" requirement
sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n require 'rubygems'\n require 'gnome2-raketask'\nend\n|" \
@ -95,7 +92,7 @@ sed -i -e "/glib-test-init/s|^.*$|require 'glib-test-init'|" \
%build
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
gem build %{gem_name}-%{version}.gemspec
gem build %{gem_name}.gemspec
%gem_install
find . -name \*.gem | xargs chmod 0644
@ -128,10 +125,9 @@ popd
pushd .%{gem_instdir}
tar xf %{SOURCE1}
mkdir test || :
cp -a gio2/test/* test
cp -a gio2/* .
cd ..
cp -a %{gem_name}-%{version} %{gem_name}
ln -sf %{gem_name}-%{version} %{gem_name}
cd -
# kill unneeded make process
@ -142,23 +138,19 @@ ln -sf /bin/true make
export PATH=$(pwd):$PATH
popd
# Kill network needed test
sed -i test/test-resolver.rb -e 's|\(test_lookup_records_async\)$|\1 ; omit "network needed"|'
sed -i test/run-test.rb \
-e '\@exit Test::Unit::AutoRunner@s|,[ \t]*File\.join(.*"test")||'
sed -i test/run-test.rb \
-e '\@run-test@s|require_relative "../../|require "|'
ruby -rrubygems -Ilib:test:%{buildroot}%{gem_extdir_mri} test/run-test.rb || \
false
# Test failure reported:
ruby -rubygems -Ilib:test:ext/%{gem_name} test/run-test.rb
cd ..
: unlink %{gem_name}
unlink %{gem_name}
cd -
popd
%files
%defattr(-,root,root,-)
%dir %{gem_instdir}
%dir %{gem_instdir}/lib/
%dir %{gem_instdir}/lib/%{gem_name}/
@ -171,274 +163,19 @@ popd
%{gem_extdir_mri}/
%exclude %{gem_cache}
%exclude %{gem_instdir}/*gemspec
%{gem_spec}
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
%files doc
%defattr(-,root,root,-)
%{gem_docdir}
%exclude %{gem_instdir}/Rakefile
%exclude %{gem_instdir}/test/
%changelog
* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.4-2
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
* Sat Dec 06 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.4-1
- 4.3.4
* Sun Oct 26 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.3-2
- Add fiddle for BR for ruby3_5
* Mon Aug 18 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.3-1
- 4.3.3
* Sat Aug 16 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.2-1
- 4.3.2
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jul 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.3.0-1
- 4.3.0
* Sat Mar 22 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.9-1
- 4.2.9
* Thu Mar 20 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.8-1
- 4.2.8
* Thu Jan 30 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.7-1
- 4.2.7
* Sun Jan 26 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.6-1
- 4.2.6
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jan 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.5-2
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
* Sun Dec 15 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.5-1
- 4.2.5
* Wed Sep 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.4-1
- 4.2.4
* Thu Sep 19 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.3-1
- 4.2.3
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Apr 02 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.2-1
- 4.2.2
* Fri Feb 23 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.1-1
- 4.2.1
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.0-2
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
* Sat Aug 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.0-1
- 4.2.0
* Sat Aug 12 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.9-1
- 4.1.9
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 26 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.8-1
- 4.1.8
* Thu Jun 1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.7-1
- 4.1.7
* Mon May 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.6-1
- 4.1.6
* Thu May 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.5-1
- 4.1.5
* Thu May 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.4-1
- 4.1.4
* Mon May 01 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.3-1
- 4.1.3
* Fri Feb 24 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.2-1
- 4.1.2
* Sun Feb 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.1-1
- 4.1.1
* Fri Feb 3 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.1.0-1
- 4.1.0
* Sun Jan 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.8-1
- 4.0.8
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jan 6 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.5-1
- 4.0.5
* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.3-3
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
* Sun Dec 25 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.3-2
- Use %%gem_extdir_mri instead of ext for %%check due to ruby3.2 change
for ext cleanup during build
* Fri Sep 16 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.3-1
- 4.0.3
* Mon Sep 5 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0.2-1
- 4.0.2
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Feb 06 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.1-4
- Rebuild again
* Thu Jan 27 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.1-3
- Re-enabled tests previously failing on 32bit again
* Wed Jan 26 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.1-2
- Skip some tests failing on 32bit
* Sun Jan 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.1-1
- 3.5.1
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Aug 10 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.9-1
- 3.4.9
* Sun Aug 8 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.7-1
- 3.4.7
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun May 2 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.4-1
- 3.4.4
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 06 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.3-2
- F-34: rebuild against ruby 3.0
* Thu Aug 13 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.3-1
- 3.4.3
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.1-2
- F-32: rebuild against ruby27
* Wed Dec 4 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.1-1
- 3.4.1
* Sat Oct 12 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.0-1
- 3.4.0
* Thu Oct 3 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.8-1
- 3.3.8
* Fri Sep 6 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.7-1
- 3.3.7
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 17 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.6-1
- 3.3.6
* Sun Feb 17 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.2-1
- 3.3.2
* Fri Feb 1 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.1-1
- 3.3.1
* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.0-2
- F-30: rebuild against ruby26
* Thu Nov 15 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.3.0-1
- 3.3.0
* Mon Aug 13 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.9-1
- 3.2.9
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 21 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.7-1
- 3.2.7
* Thu May 3 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.5-1
- 3.2.5
* Wed Apr 18 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.4-1
- 3.2.4
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 3.2.1-3
- Rebuilt for switch to libxcrypt
* Wed Jan 03 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.1-2
- F-28: rebuild for ruby25
* Tue Nov 28 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.1-1
- 3.2.1
* Tue Nov 14 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.0-1
- 3.2.0
* Sat Oct 21 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.9-1
- 3.1.9
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sun Jul 16 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.8-1
- 3.1.8
* Wed Jul 12 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.7-1
- 3.1.7
* Tue Jun 6 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.6-1
- 3.1.6
* Thu May 4 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.3-1
- 3.1.3
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 1 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.1-2
- Upstream patch to fix test failure wrt schemas path

View file

@ -1,2 +1,2 @@
SHA512 (gio2-4.3.4.gem) = 65851ee4b5e161b9af7b3f00d8599d88e6f58ecdd85f7440534cf308ae040914108db0291cfcf36bc7443514891c96dfa86bab264ba7b3cfa8ed29593166f09f
SHA512 (gio2-4.3.4-test-missing-files.tar.gz) = bb06332232c8f2389e5bdb99c5a4b4da241c7d2ef851b1e4e5a491f3552b230adc1429d6d90574e6275c3103f7fab8c11a63be4ec9ff36302ba0dbbbd8cc1985
SHA512 (gio2-3.1.1.gem) = 2952d51c1bba9fdc6ee947783ef83adee65c330753a82cfbdbf37cef544989dd4b7be390983bca2d458bb43468b54b92770532cc61ed47d04f09ede0e60d87f6
SHA512 (gio2-3.1.1-test-missing-files.tar.gz) = 05a9703264cc70317c64c611af149ec8ed54f09921111b7d48d8842e3d048fab66d53d7edacdf2b10e46f7fa6bd638cb13898eceee12c8843adcec579b1773c2