[rubygem-cocaine/f21] Update to latest Fedora Ruby guidelines
Ken Dreyer
ktdreyer at fedoraproject.org
Sat Nov 8 20:02:41 UTC 2014
commit f78dc9aea8f04c713d4157aaa753ec59053dcf23
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Sat Nov 8 13:01:28 2014 -0700
Update to latest Fedora Ruby guidelines
- drop explicit Requires and Provides
- Use %license tag
- Patch for Rails 4
rubygem-cocaine-0.5.4-rails-4.patch | 23 +++++++++++++++++++++++
rubygem-cocaine.spec | 21 +++++++++++++++++++--
2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-cocaine-0.5.4-rails-4.patch b/rubygem-cocaine-0.5.4-rails-4.patch
new file mode 100644
index 0000000..7ad8036
--- /dev/null
+++ b/rubygem-cocaine-0.5.4-rails-4.patch
@@ -0,0 +1,23 @@
+commit 750db8031f2ea89bd6c3765ab8bf4848e272bec1
+Author: Jon Yurek <jyurek at thoughtbot.com>
+Date: Fri May 23 11:16:17 2014 -0400
+
+ Don't mind if BufferedLogger doesn't load
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index dc7a1bb..7cc8aeb 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -5,9 +5,11 @@ require 'cocaine'
+ require 'timeout'
+ require 'tempfile'
+ require 'pry'
+-require 'active_support/buffered_logger'
+ require 'thread'
+
++begin; require 'active_support/logger'; rescue LoadError; end
++begin; require 'active_support/buffered_logger'; rescue LoadError; end
++
+ Dir[File.dirname(__FILE__) + "/support/**.rb"].each{|support_file| require support_file }
+
+ RSpec.configure do |config|
diff --git a/rubygem-cocaine.spec b/rubygem-cocaine.spec
index a2c3e15..8f81cbb 100644
--- a/rubygem-cocaine.spec
+++ b/rubygem-cocaine.spec
@@ -2,17 +2,23 @@
Name: rubygem-%{gem_name}
Version: 0.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A small library for doing (command) lines
Group: Development/Languages
License: MIT
URL: https://github.com/thoughtbot/cocaine
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# ActiveSupport::BufferedLogger is gone in Rails 4.0.
+# Patch0 is in master (750db8031f2ea89bd6c3765ab8bf4848e272bec1), not yet in a
+# tagged release on rubygems.org.
+Patch0: rubygem-cocaine-0.5.4-rails-4.patch
+%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
Requires: ruby(release)
Requires: ruby(rubygems)
Requires: rubygem(climate_control) >= 0.0.3
Requires: rubygem(climate_control) < 1.0
Requires: rubygem(posix-spawn)
+%endif
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: rubygem(rspec)
@@ -22,7 +28,9 @@ BuildRequires: rubygem(climate_control) >= 0.0.3
BuildRequires: rubygem(climate_control) < 1.0
BuildRequires: rubygem(posix-spawn)
BuildArch: noarch
+%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
Provides: rubygem(%{gem_name}) = %{version}
+%endif
%description
A small library for doing (command) lines
@@ -50,6 +58,9 @@ for f in .gitignore .travis.yml Gemfile Rakefile; do
sed -i "s|\"$f\",||g" %{gem_name}.gemspec
done
+# ActiveSupport::BufferedLogger is gone in Rails 4.0.
+%patch0 -p1
+
# Remove dependency on pry gem.
sed -e "/require 'pry'/d" -i spec/spec_helper.rb
@@ -74,8 +85,9 @@ popd
%files
+%{!?_licensedir:%global license %%doc}
%dir %{gem_instdir}
-%doc %{gem_instdir}/LICENSE
+%license %{gem_instdir}/LICENSE
%doc %{gem_instdir}/README.md
%{gem_libdir}
%exclude %{gem_cache}
@@ -88,6 +100,11 @@ popd
%exclude %{gem_instdir}/spec
%changelog
+* Sat Nov 08 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.5.4-3
+- Update to latest Fedora Ruby guidelines (drop explicit Requires and Provides)
+- Use %%license tag
+- Patch for Rails 4
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list