From 3d9507224cead401bc24cb0c65499bb4470601cf Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Jan 08 2016 16:17:44 +0000 Subject: Update to 4.1.4 (rhbz#1288675) - Drop Fedora 20 conditionals - Use %autosetup macro --- diff --git a/.gitignore b/.gitignore index da1a556..b997084 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /exception_notification-4.0.1.gem /exception_notification-4.1.0.gem /exception_notification-4.1.1.gem +/exception_notification-4.1.4.gem diff --git a/0001-rake-remove-Bundler-and-Appraisal-deps.patch b/0001-rake-remove-Bundler-and-Appraisal-deps.patch index f525082..263bae2 100644 --- a/0001-rake-remove-Bundler-and-Appraisal-deps.patch +++ b/0001-rake-remove-Bundler-and-Appraisal-deps.patch @@ -1,7 +1,7 @@ -From 9d167b6cdf4faa4d8436fdb7908254a1a3545aea Mon Sep 17 00:00:00 2001 +From d229f1c970b19962ec0f26a77a59c832b767a88a Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 4 Sep 2013 17:09:05 -0600 -Subject: [PATCH 1/6] rake: remove Bundler and Appraisal deps +Subject: [PATCH 1/5] rake: remove Bundler and Appraisal deps --- Rakefile | 7 +------ @@ -29,5 +29,5 @@ index 97b290a..43d83e0 100644 end -- -2.3.6 +2.4.3 diff --git a/0002-make-tinder-gem-optional-for-test-suite.patch b/0002-make-tinder-gem-optional-for-test-suite.patch index 5be6029..cc918c1 100644 --- a/0002-make-tinder-gem-optional-for-test-suite.patch +++ b/0002-make-tinder-gem-optional-for-test-suite.patch @@ -1,7 +1,7 @@ -From 52246227d86d05bf1ae78bd354b4fc13e25e1224 Mon Sep 17 00:00:00 2001 +From 3c07872569e3e55a6baf68b6fdaa4a72e74d51c8 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 4 Sep 2013 21:26:33 -0600 -Subject: [PATCH 2/6] make tinder gem optional for test suite +Subject: [PATCH 2/5] make tinder gem optional for test suite Fedora does not yet have a rubygem-tinder package. Instead of bailing out when tinder is missing, just print a warning and move on. @@ -12,7 +12,7 @@ When Fedora does get a tinder package, we can drop this patch. 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/exception_notifier/campfire_notifier_test.rb b/test/exception_notifier/campfire_notifier_test.rb -index 0821e7c..c29cce7 100644 +index 569936e..d6df9d0 100644 --- a/test/exception_notifier/campfire_notifier_test.rb +++ b/test/exception_notifier/campfire_notifier_test.rb @@ -1,5 +1,9 @@ @@ -26,12 +26,12 @@ index 0821e7c..c29cce7 100644 class CampfireNotifierTest < ActiveSupport::TestCase -@@ -51,3 +55,5 @@ class CampfireNotifierTest < ActiveSupport::TestCase - end +@@ -98,3 +102,5 @@ class CampfireNotifierTest < ActiveSupport::TestCase + StandardError.new('my custom error') end end + +end -- -2.3.6 +2.4.3 diff --git a/0003-make-pigeon-carrier-gem-optional-for-test-suite.patch b/0003-make-pigeon-carrier-gem-optional-for-test-suite.patch index a8955a3..734505d 100644 --- a/0003-make-pigeon-carrier-gem-optional-for-test-suite.patch +++ b/0003-make-pigeon-carrier-gem-optional-for-test-suite.patch @@ -1,7 +1,7 @@ -From 555ca9189658b4571b4770e45baf484bfb6c1cda Mon Sep 17 00:00:00 2001 +From 215553d18818273d141058a736713be00f62a766 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 26 May 2015 10:53:34 -0600 -Subject: [PATCH 3/6] make pigeon-carrier gem optional for test suite +Subject: [PATCH 3/5] make pigeon-carrier gem optional for test suite Fedora does not yet have a rubygem-pigeon-carrier package. Instead of bailing out when pigeon-carrier is missing, just print a warning and @@ -13,7 +13,7 @@ When Fedora does get a pigeon-carrier package, we can drop this patch. 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/exception_notifier/irc_notifier_test.rb b/test/exception_notifier/irc_notifier_test.rb -index 0049da9..002b5d3 100644 +index 910b63f..88f8517 100644 --- a/test/exception_notifier/irc_notifier_test.rb +++ b/test/exception_notifier/irc_notifier_test.rb @@ -1,5 +1,9 @@ @@ -27,12 +27,12 @@ index 0049da9..002b5d3 100644 class IrcNotifierTest < ActiveSupport::TestCase -@@ -83,3 +87,5 @@ class IrcNotifierTest < ActiveSupport::TestCase - end +@@ -119,3 +123,5 @@ class IrcNotifierTest < ActiveSupport::TestCase + StandardError.new('my custom error') end end + +end -- -2.3.6 +2.4.3 diff --git a/0004-make-slack-notifier-gem-optional-for-test-suite.patch b/0004-make-slack-notifier-gem-optional-for-test-suite.patch index 553e5a2..ac39858 100644 --- a/0004-make-slack-notifier-gem-optional-for-test-suite.patch +++ b/0004-make-slack-notifier-gem-optional-for-test-suite.patch @@ -1,7 +1,7 @@ -From a2062316fe05b86302f75a29d59f096f3156e26e Mon Sep 17 00:00:00 2001 +From 7b1f643972b2316e90f5af765842adddd7355fbc Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 26 May 2015 10:54:53 -0600 -Subject: [PATCH 4/6] make slack-notifier gem optional for test suite +Subject: [PATCH 4/5] make slack-notifier gem optional for test suite Fedora does not yet have a rubygem-slack-notifier package. Instead of bailing out when slack-notifier is missing, just print a warning and @@ -14,7 +14,7 @@ patch. 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/exception_notifier/slack_notifier_test.rb b/test/exception_notifier/slack_notifier_test.rb -index e03c026..da14637 100644 +index 67a7dbe..ea73685 100644 --- a/test/exception_notifier/slack_notifier_test.rb +++ b/test/exception_notifier/slack_notifier_test.rb @@ -1,5 +1,9 @@ @@ -28,12 +28,12 @@ index e03c026..da14637 100644 class SlackNotifierTest < ActiveSupport::TestCase -@@ -115,3 +119,5 @@ class SlackNotifierTest < ActiveSupport::TestCase - message += "*Backtrace:*\n" + exception.backtrace.join("\n") +@@ -164,3 +168,5 @@ class SlackNotifierTest < ActiveSupport::TestCase end + end + +end -- -2.3.6 +2.4.3 diff --git a/0005-make-sidekiq-gem-optional-for-test-suite.patch b/0005-make-sidekiq-gem-optional-for-test-suite.patch index 89a02f8..fcdf1c1 100644 --- a/0005-make-sidekiq-gem-optional-for-test-suite.patch +++ b/0005-make-sidekiq-gem-optional-for-test-suite.patch @@ -1,7 +1,7 @@ -From 660c5b66bdd33aeedbd0ee86b8bd39f11b7a924a Mon Sep 17 00:00:00 2001 +From 499a87c80b56b299fdd8980c2361bf1e378d5e54 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 26 May 2015 21:53:45 -0600 -Subject: [PATCH 5/6] make sidekiq gem optional for test suite +Subject: [PATCH 5/5] make sidekiq gem optional for test suite Fedora does not yet have a rubygem-sidekiq package. Instead of bailing out when sidekiq is missing, just print a warning and move on. @@ -35,5 +35,5 @@ index 95169c2..e634598 100644 + +end -- -2.3.6 +2.4.3 diff --git a/rubygem-exception_notification.spec b/rubygem-exception_notification.spec index cda2a4d..2f627d1 100644 --- a/rubygem-exception_notification.spec +++ b/rubygem-exception_notification.spec @@ -1,8 +1,8 @@ %global gem_name exception_notification Name: rubygem-%{gem_name} -Version: 4.1.1 -Release: 2%{?dist} +Version: 4.1.4 +Release: 1%{?dist} Summary: Exception notification for Rails apps Group: Development/Languages License: MIT @@ -17,13 +17,13 @@ Patch2: 0002-make-tinder-gem-optional-for-test-suite.patch Patch3: 0003-make-pigeon-carrier-gem-optional-for-test-suite.patch Patch4: 0004-make-slack-notifier-gem-optional-for-test-suite.patch Patch5: 0005-make-sidekiq-gem-optional-for-test-suite.patch -%if 0%{?fc20} || 0%{?el7} -Requires: ruby(release) +%if 0%{?el7} +Requires: ruby(release) >= 2 Requires: ruby(rubygems) Requires: rubygem(actionmailer) >= 3.0.4 Requires: rubygem(activesupport) >= 3.0.4 %endif -BuildRequires: ruby(release) +BuildRequires: ruby(release) >= 2 BuildRequires: rubygems-devel BuildRequires: rubygem(actionmailer) >= 3.0.4 BuildRequires: rubygem(activesupport) >= 3.0.4 @@ -35,7 +35,7 @@ BuildRequires: rubygem(rake) BuildRequires: rubygem(rails) >= 3.0.4 BuildRequires: rubygem(sqlite3) BuildArch: noarch -%if 0%{?fc20} || 0%{?el7} +%if 0%{?el7} Provides: rubygem(%{gem_name}) = %{version} %endif @@ -58,16 +58,10 @@ Documentation for %{name}. %prep gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version} +%autosetup -p 1 -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 - # Remove unnecessary bundler dependency from dummy Rails in test suite sed -i '/bundler/d' test/dummy/config/boot.rb # With bundler gone, we need to explicitly load exception_notification here @@ -77,7 +71,7 @@ echo "require 'exception_notification'" >> test/dummy/config/boot.rb sed -i 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' test/dummy/script/rails # Remove developer-only files. -for f in Appraisals Gemfile Gemfile.lock \ +for f in Appraisals Gemfile \ test/dummy/.gitignore \ test/dummy/lib/tasks/.gitkeep \ test/dummy/public/stylesheets/.gitkeep ; do @@ -112,7 +106,6 @@ popd %files -%{!?_licensedir:%global license %%doc} %dir %{gem_instdir} %license %{gem_instdir}/MIT-LICENSE %doc %{gem_instdir}/README.md @@ -131,6 +124,11 @@ popd %changelog +* Fri Jan 08 2016 Ken Dreyer - 4.1.4-1 +- Update to 4.1.4 (rhbz#1288675) +- Drop Fedora 20 conditionals +- Use %%autosetup macro + * Thu Jun 18 2015 Fedora Release Engineering - 4.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a449662..eb54338 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -020074f81808121d96cdce7d29ec31c0 exception_notification-4.1.1.gem +c09b62517abd5d8ecba4672f711ff40d exception_notification-4.1.4.gem