[rubygem-paranoia/f21] Fix FTBFS in Rawhide (hrbz#1107191).
Vít Ondruch
vondruch at fedoraproject.org
Tue Jul 29 12:04:08 UTC 2014
commit 2e06ac267de7e802db11255ff537c1110db6b119
Author: Vít Ondruch <vondruch at redhat.com>
Date: Tue Jul 29 14:02:57 2014 +0200
Fix FTBFS in Rawhide (hrbz#1107191).
...ch-fires-after-commit-callback-fixed-test.patch | 27 ++++++++++++++++++++
rubygem-paranoia.spec | 21 +++++++++------
2 files changed, 40 insertions(+), 8 deletions(-)
---
diff --git a/rubygem-paranoia-2.0.2-touch-fires-after-commit-callback-fixed-test.patch b/rubygem-paranoia-2.0.2-touch-fires-after-commit-callback-fixed-test.patch
new file mode 100644
index 0000000..006f473
--- /dev/null
+++ b/rubygem-paranoia-2.0.2-touch-fires-after-commit-callback-fixed-test.patch
@@ -0,0 +1,27 @@
+From 563c6cbba22c9e58ad6186c18d04033237ea961b Mon Sep 17 00:00:00 2001
+From: Martin Sereinig <martin.sereinig at lomography.com>
+Date: Tue, 8 Jul 2014 11:47:20 +0200
+Subject: [PATCH] as of rails 4.0.4, touch fires after_commit callback - fixed
+ test.
+
+Fixes #143
+---
+ test/paranoia_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/paranoia_test.rb b/test/paranoia_test.rb
+index 5fed2a4..81d175f 100644
+--- a/test/paranoia_test.rb
++++ b/test/paranoia_test.rb
+@@ -99,7 +99,7 @@ def test_delete_behavior_for_plain_models_callbacks
+ assert_equal nil, model.instance_variable_get(:@validate_called)
+ assert_equal nil, model.instance_variable_get(:@destroy_callback_called)
+ assert_equal nil, model.instance_variable_get(:@after_destroy_callback_called)
+- assert_equal nil, model.instance_variable_get(:@after_commit_callback_called)
++ assert model.instance_variable_get(:@after_commit_callback_called)
+ end
+
+ def test_destroy_behavior_for_paranoid_models
+--
+2.0.3
+
diff --git a/rubygem-paranoia.spec b/rubygem-paranoia.spec
index 835fc46..0f0f57f 100644
--- a/rubygem-paranoia.spec
+++ b/rubygem-paranoia.spec
@@ -4,23 +4,21 @@
Summary: Cleaner re-implementation of acts_as_paranoid (ActiveRecord soft-delete plugin)
Name: rubygem-%{gem_name}
Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubygems.org/gems/paranoia
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(release)
-Requires: ruby(rubygems) >= 1.3.6
-Requires: ruby
-Requires: rubygem(activerecord) >= 4.0.0
+# As of rails 4.0.4, touch fires after_commit callback - fixed test.
+# https://github.com/radar/paranoia/commit/563c6cbba22c9e58ad6186c18d04033237ea961b
+Patch0: rubygem-paranoia-2.0.2-touch-fires-after-commit-callback-fixed-test.patch
BuildRequires: ruby(release)
BuildRequires: ruby
BuildRequires: rubygems-devel
-BuildArch: noarch
BuildRequires: rubygem(minitest)
BuildRequires: rubygem(sqlite3)
BuildRequires: rubygem(activerecord)
-Provides: rubygem(%{gem_name}) = %{version}
+BuildArch: noarch
%description
Paranoia is a re-implementation of acts_as_paranoid
@@ -47,11 +45,15 @@ Documentation for %{name}
%setup -q -c -T
%gem_install -n %{SOURCE0}
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
%build
%check
pushd .%{gem_instdir}
-RUBYOPT="-rfileutils" testrb test/*
+ruby -e 'Dir.glob "./test/*_test.rb", &method(:require)'
popd
%install
@@ -79,6 +81,9 @@ popd
%{gem_instdir}/Gemfile
%changelog
+* Tue Jul 29 2014 Vít Ondruch <vondruch at redhat.com> - 2.0.2-3
+- Fix FTBFS in Rawhide (hrbz#1107191).
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list