diff --git a/.gitignore b/.gitignore index 1cb74bc..6664d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /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 diff --git a/ruby-gnome2-0013-gio2-support-Gio-Application.new-arguments.patch b/ruby-gnome2-0013-gio2-support-Gio-Application.new-arguments.patch deleted file mode 100644 index fab7645..0000000 --- a/ruby-gnome2-0013-gio2-support-Gio-Application.new-arguments.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ffe9fec4c2cd83c08cd90b4139bc562c2558e44a Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Mon, 12 Oct 2015 16:56:51 +0900 -Subject: [PATCH 13/14] gio2: support Gio::Application.new(:arguments => [...]) - -GitHub: fix #519 - -Reported by Mamoru TASAKA. Thanks!!! ---- - gio2/lib/gio2/application-command-line.rb | 12 ++++++++++++ - gio2/test/test-application-command-line.rb | 6 ++---- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/gio2/lib/gio2/application-command-line.rb b/gio2/lib/gio2/application-command-line.rb -index 97fbb30..c739064 100644 ---- a/gio2/lib/gio2/application-command-line.rb -+++ b/gio2/lib/gio2/application-command-line.rb -@@ -16,6 +16,18 @@ - - module Gio - class ApplicationCommandLine -+ def initialize(properties=nil) -+ if properties -+ arguments = properties[:arguments] -+ if arguments and !arguments.is_a?(GLib::Variant) -+ arguments = GLib::Variant.new(arguments, -+ GLib::VariantType::BYTESTRING_ARRAY) -+ properties = properties.merge(:arguments => arguments) -+ end -+ end -+ super(properties) -+ end -+ - alias_method :arguments_raw, :arguments - def arguments - arguments_raw[0] -diff --git a/gio2/test/test-application-command-line.rb b/gio2/test/test-application-command-line.rb -index 441bb81..d699551 100644 ---- a/gio2/test/test-application-command-line.rb -+++ b/gio2/test/test-application-command-line.rb -@@ -16,12 +16,10 @@ - - class TestApplicationCommandLine < Test::Unit::TestCase - include GioTestUtils::Omissions -- def setup -- @command_line = Gio::ApplicationCommandLine.new -- end - - test "#arguments" do - omit_on_travis_ci -- assert_equal([], @command_line.arguments) -+ command_line = Gio::ApplicationCommandLine.new(:arguments => ["hello"]) -+ assert_equal(["hello"], command_line.arguments) - end - end --- -2.5.0 - diff --git a/rubygem-gio2.spec b/rubygem-gio2.spec index ba14c41..7fe6689 100644 --- a/rubygem-gio2.spec +++ b/rubygem-gio2.spec @@ -1,14 +1,14 @@ %global header_dir %{ruby_vendorarchdir} -%global glibminver 3.0.7 +%global glibminver 3.0.8 %global obsoleteevr 0.90.7-1.999 %global gem_name gio2 Summary: Ruby binding of gio-2.0.x Name: rubygem-%{gem_name} -Version: 3.0.7 -Release: 4%{?dist} +Version: 3.0.8 +Release: 1%{?dist} Group: Development/Languages # from README License: LGPLv2 @@ -17,9 +17,6 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: gio2-%{version}-test-missing-files.tar.gz # Source1 is generated by the below Source2: gio2-create-missing-test-files.sh -# https://github.com/ruby-gnome2/ruby-gnome2/issues/591 -# https://github.com/ruby-gnome2/ruby-gnome2/commit/ffe9fec4c2cd83c08cd90b4139bc562c2558e44a.patch -Patch1: ruby-gnome2-0013-gio2-support-Gio-Application.new-arguments.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -71,10 +68,8 @@ gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch1 -p2 - # Allow ruby-gnome2 no less than ones -sed -i -e 's|= 3\.0\.7|>= 3.0.7|' %{gem_name}.gemspec +sed -i -e 's|= 3\.0\.8|>= 3.0.8|' %{gem_name}.gemspec # 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|" \ @@ -170,6 +165,9 @@ popd %exclude %{gem_instdir}/test/ %changelog +* Tue Apr 19 2016 TASAKA - 3.0.8-1 +- 3.0.8 + * Thu Feb 04 2016 Fedora Release Engineering - 3.0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 209ed31..e36120e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9ae1e711dacadbba6c4a20a2018ad921 gio2-3.0.7.gem -be8afccd139429e94028edabfb393147 gio2-3.0.7-test-missing-files.tar.gz +940f2e97c59aa4edbf795854a250ce86 gio2-3.0.8.gem +cd7d69a71d77604539b02e4d593ddf1a gio2-3.0.8-test-missing-files.tar.gz