diff --git a/.gitignore b/.gitignore index 8d140bf..87a4c38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,64 +1,2 @@ -/gtk3-2.0.2.gem -/gtk3-2.1.0.gem -/gtk3-2.2.0.gem -/gtk3-2.2.3.gem -/gtk3-2.2.4.gem -/gtk3-2.2.5.gem -/gtk3-3.0.4.gem -/gtk3-3.0.4-test-missing-files.tar.gz -/gtk3-3.0.5.gem -/gtk3-3.0.5-test-missing-files.tar.gz -/gtk3-3.0.7.gem -/gtk3-3.0.7-test-missing-files.tar.gz -/gtk3-3.0.8.gem -/gtk3-3.0.8-test-missing-files.tar.gz -/gtk3-3.0.9.gem -/gtk3-3.0.9-test-missing-files.tar.gz -/gtk3-3.1.0.gem -/gtk3-3.1.0-test-missing-files.tar.gz -/gtk3-3.1.1.gem -/gtk3-3.1.1-test-missing-files.tar.gz -/gtk3-3.1.3.gem -/gtk3-3.1.3-test-missing-files.tar.gz -/gtk3-3.1.6.gem -/gtk3-3.1.6-test-missing-files.tar.gz -/gtk3-3.1.7.gem -/gtk3-3.1.7-test-missing-files.tar.gz -/gtk3-3.1.8.gem -/gtk3-3.1.8-test-missing-files.tar.gz -/gtk3-3.1.9.gem -/gtk3-3.1.9-test-missing-files.tar.gz -/gtk3-3.2.0.gem -/gtk3-3.2.0-test-missing-files.tar.gz -/gtk3-3.2.1.gem -/gtk3-3.2.1-test-missing-files.tar.gz -/gtk3-3.2.4.gem -/gtk3-3.2.4-test-missing-files.tar.gz -/gtk3-3.2.5.gem -/gtk3-3.2.5-test-missing-files.tar.gz -/gtk3-3.2.7.gem -/gtk3-3.2.7-test-missing-files.tar.gz -/gtk3-3.2.9.gem -/gtk3-3.2.9-test-missing-files.tar.gz -/gtk3-3.3.0.gem -/gtk3-3.3.0-test-missing-files.tar.gz -/gtk3-3.3.1.gem -/gtk3-3.3.1-test-missing-files.tar.gz -/gtk3-3.3.2.gem -/gtk3-3.3.2-test-missing-files.tar.gz -/gtk3-3.3.6.gem -/gtk3-3.3.6-test-missing-files.tar.gz -/gtk3-3.3.7.gem -/gtk3-3.3.7-test-missing-files.tar.gz -/gtk3-3.4.0.gem -/gtk3-3.4.0-test-missing-files.tar.gz -/gtk3-3.4.1-test-missing-files.tar.gz -/gtk3-3.4.1.gem -/gtk3-3.4.3.gem -/gtk3-3.4.3-test-missing-files.tar.gz -/gtk3-3.4.4.gem -/gtk3-3.4.4-test-missing-files.tar.gz -/gtk3-3.4.7.gem -/gtk3-3.4.7-test-missing-files.tar.gz -/gtk3-3.4.9-test-missing-files.tar.gz -/gtk3-3.4.9.gem +/gtk3-*gem +/gtk3-*-test-missing-files.tar.gz diff --git a/gtk3-create-missing-test-files.sh b/gtk3-create-missing-test-files.sh index 3cadff7..e1aaaba 100644 --- a/gtk3-create-missing-test-files.sh +++ b/gtk3-create-missing-test-files.sh @@ -22,7 +22,7 @@ pushd $TMPDIR git clone https://github.com/ruby-gnome2/ruby-gnome2.git cd ruby-gnome2/ -git reset --hard $VERSION +git reset --hard $VERSION || true tar czf $CURDIR/gtk3-${VERSION}-test-missing-files.tar.gz gtk3/test/fixture/ popd diff --git a/rubygem-gtk3.spec b/rubygem-gtk3.spec index f3a5524..44fde29 100644 --- a/rubygem-gtk3.spec +++ b/rubygem-gtk3.spec @@ -7,11 +7,13 @@ # Planned for F-20+ only Summary: Ruby/GTK3 is a Ruby binding of GTK+-3.x Name: rubygem-%{gem_name} -Version: 3.4.9 -Release: 1%{?dist} +Version: 4.3.4 +Release: 2%{?dist} -# Various files in gem -License: LGPLv2+ +# SPDX confirmed +# LGPL-2.1-or-later: gemspec +# GFDL-1.3-no-invariants-or-later: sample/misc/flowbox.rb +License: LGPL-2.1-or-later URL: http://ruby-gnome2.sourceforge.jp/ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # https://raw.github.com/ruby-gnome2/ruby-gnome2/master/gtk3/COPYING.LIB @@ -44,12 +46,10 @@ BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(rake) # Needs X BuildRequires: xorg-x11-server-Xvfb -# Icon for face-cool +# Icon for face-cool-symbolic +BuildRequires: adwaita-icon-theme +# "edit-find" BuildRequires: gnome-icon-theme -# gtkrc -BuildRequires: adwaita-gtk2-theme -# "actions/find" -BuildRequires: gnome-icon-theme-legacy Provides: rubygem(%{gem_name}) = %{version}-%{release} %description @@ -67,6 +67,7 @@ rubygem-%{gem_name} %package doc Summary: Documentation for %{name} +License: LGPL-2.1-or-later AND GFDL-1.3-no-invariants-or-later Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -74,39 +75,28 @@ BuildArch: noarch Documentation for %{name} %prep -%setup -q -c -T - -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - -gem unpack %{SOURCE0} -cd %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} +mv ../%{gem_name}-%{version}.gemspec . # Permission find . -name \*.rb -print0 | xargs --null chmod 0644 -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec - # Allow ruby-gnome2 no less than ones -sed -i -e 's|= 3\.4\.9|>= 3.4.9|' %{gem_name}.gemspec +sed -i -e 's|= 4\.3\.4|>= 4.3.4|' %{gem_name}-%{version}.gemspec + +# Remove unneeded rake runtime dependency +sed -i %{gem_name}-%{version}.gemspec \ + -e '\@add_runtime_dependency.*rake@d' # Add license text install -cpm 644 %{SOURCE1} ./COPYING.LIB sed -i -e '/files =/s|\("Rakefile",\)|\1 "COPYING.LIB", |' \ - %{gem_name}.gemspec - -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir + %{gem_name}-%{version}.gemspec %build -mkdir -p .%{gem_dir} - export CONFIGURE_ARGS="--with-cflags='%{optflags} -Werror-implicit-function-declaration'" export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig" +gem build %{gem_name}-%{version}.gemspec %gem_install %install @@ -137,6 +127,14 @@ rm -f .%{gem_instdir}/extconf.rb popd %check +# ref: https://bugzilla.redhat.com/show_bug.cgi?id=2275913 +# glycin on ppc64le is currently unusable +%if 0%{?fedora} >= 43 +%ifarch ppc64le +exit 0 +%endif +%endif + pushd .%{gem_instdir} tar xf %{SOURCE2} @@ -145,8 +143,9 @@ cd .. ln -sf %{gem_name}-%{version} %{gem_name} cd - -%ifarch %arm -#mv test/test-gtk-list-store.rb{,.save} +%if 0%{?fedora} >= 39 +# icon-theme seems broken, skipping for now +mv test/test-gtk-icon-theme.rb{,.save} %endif sed -i test/run-test.rb \ @@ -164,11 +163,11 @@ xvfb-run \ %if 0%{?fedora} >= 25 -s "-screen 0 640x480x24 $RANDR_OPTS" \ %endif - ruby -I../lib:.:../ext/%{gem_name} run-test.rb + ruby -I../lib:.:%{buildroot}%{gem_extdir_mri} run-test.rb cd .. -%ifarch %arm -#mv test/test-gtk-list-store.rb{.save,} +%if 0%{?fedora} >= 39 +mv test/test-gtk-icon-theme.rb{.save,} %endif cd .. @@ -203,6 +202,145 @@ popd %exclude %{gem_instdir}/test/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 4.3.4-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + +* Sat Dec 06 2025 Mamoru TASAKA - 4.3.4-1 +- 4.3.4 + +* Mon Aug 18 2025 Mamoru TASAKA - 4.3.3-1 +- 4.3.3 + +* Sat Aug 16 2025 Mamoru TASAKA - 4.3.2-1 +- 4.3.2 + +* Tue Aug 12 2025 Mamoru TASAKA - 4.3.0-3 +- Exclude tests on glycin ppc64le for now (bug 2275913) + +* Fri Jul 25 2025 Fedora Release Engineering - 4.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jul 15 2025 Mamoru TASAKA - 4.3.0-1 +- 4.3.0 + +* Sat Mar 22 2025 Mamoru TASAKA - 4.2.9-1 +- 4.2.9 + +* Thu Mar 20 2025 Mamoru TASAKA - 4.2.8-1 +- 4.2.8 + +* Thu Jan 30 2025 Mamoru TASAKA - 4.2.7-1 +- 4.2.7 + +* Sun Jan 26 2025 Mamoru TASAKA - 4.2.6-1 +- 4.2.6 + +* Sat Jan 18 2025 Fedora Release Engineering - 4.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 07 2025 Mamoru TASAKA - 4.2.5-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + +* Sun Dec 15 2024 Mamoru TASAKA - 4.2.5-1 +- 4.2.5 + +* Wed Sep 25 2024 Mamoru TASAKA - 4.2.4-1 +- 4.2.4 + +* Tue Sep 24 2024 Mamoru TASAKA - 4.2.3-2 +- Execute test which no longer fails + +* Thu Sep 19 2024 Mamoru TASAKA - 4.2.3-1 +- 4.2.3 + +* Fri Jul 19 2024 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Apr 02 2024 Mamoru TASAKA - 4.2.2-1 +- 4.2.2 + +* Fri Feb 23 2024 Mamoru TASAKA - 4.2.1-1 +- 4.2.1 + +* Fri Jan 26 2024 Fedora Release Engineering - 4.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Mamoru TASAKA - 4.2.0-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + +* Sat Aug 19 2023 Mamoru TASAKA - 4.2.0-1 +- 4.2.0 + +* Sat Aug 12 2023 Mamoru TASAKA - 4.1.9-1 +- 4.1.9 + +* Sat Jul 22 2023 Mamoru TASAKA - 4.1.8-3 +- F-39: skip icon theme test for now + +* Fri Jul 21 2023 Fedora Release Engineering - 4.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 26 2023 Mamoru TASAKA - 4.1.8-1 +- 4.1.8 + +* Thu Jun 1 2023 Mamoru TASAKA - 4.1.7-1 +- 4.1.7 + +* Mon May 22 2023 Mamoru TASAKA - 4.1.6-1 +- 4.1.6 + +* Thu May 11 2023 Mamoru TASAKA - 4.1.5-1 +- 4.1.5 + +* Thu May 04 2023 Mamoru TASAKA - 4.1.4-1 +- 4.1.4 + +* Mon May 01 2023 Mamoru TASAKA - 4.1.3-1 +- 4.1.3 + +* Fri Feb 24 2023 Mamoru TASAKA - 4.1.2-1 +- 4.1.2 + +* Sun Feb 19 2023 Mamoru TASAKA - 4.1.1-1 +- 4.1.1 + +* Fri Feb 3 2023 Mamoru TASAKA - 4.1.0-1 +- 4.1.0 + +* Sun Jan 22 2023 Mamoru TASAKA - 4.0.8-1 +- 4.0.8 + +* Fri Jan 20 2023 Fedora Release Engineering - 4.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 6 2023 Mamoru TASAKA - 4.0.5-1 +- 4.0.5 + +* Wed Jan 04 2023 Mamoru TASAKA - 4.0.3-3 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + +* Sun Dec 25 2022 Mamoru TASAKA - 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 - 4.0.3-1 +- 4.0.3 + +* Mon Sep 5 2022 Mamoru TASAKA - 4.0.2-1 +- 4.0.2 + +* Sat Jul 23 2022 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jan 23 2022 Mamoru TASAKA - 3.5.1-1 +- 3.5.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 3.4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Aug 10 2021 Mamoru TASAKA - 3.4.9-1 - 3.4.9 diff --git a/sources b/sources index 362a3dc..f9cdd91 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gtk3-3.4.9-test-missing-files.tar.gz) = a7db54683cb1ca38c180a8a9a5062c6d231e08ca5da4255733a61bf454030b053068f83dd1e8c76ebc1e0bfd4bb3545e82f9ebf6000c25d3caeebc28bb3e0f01 -SHA512 (gtk3-3.4.9.gem) = 6beb18d3a2d7a317672a64b8c3a18829658e1cf4a272dd758a5d0c1a209d81f5ceae49fc34314e744240c9b2df5a712880efe10680949300d4b993cf35dcc043 +SHA512 (gtk3-4.3.4.gem) = a3eaef0866d8183f3c6402b5d69f16f5711227c4676ba5749fdee384b76f6f819739fd3f72a33b1b96858b88bdf4984ea19071c412f2e60d9d03a953ba7f36ae +SHA512 (gtk3-4.3.4-test-missing-files.tar.gz) = f0f79f5c33b391f479a8cf88b98190b62a6016abdd4b44b95346faadd09a8715105250abcad33316ee3b79a67857f801c980dcd8fc1b570456d7e7a6b9cd8ad5