From 7830a61cba75e49d1cacd0e5559a14de6a9bdcad Mon Sep 17 00:00:00 2001 From: Josef Stribny Date: Wed, 19 Aug 2015 18:25:48 +0200 Subject: [PATCH] Update to listen 3.0.3 --- .gitignore | 2 + ...coded-platform-specific-dependencies.patch | 29 ---------- ...coded-platform-specific-dependencies.patch | 25 ++++++++ rubygem-listen.spec | 58 +++++++++---------- sources | 3 +- 5 files changed, 55 insertions(+), 62 deletions(-) delete mode 100644 listen-2.7.11-Remove-hardcoded-platform-specific-dependencies.patch create mode 100644 listen-3.0.3-Remove-hardcoded-platform-specific-dependencies.patch diff --git a/.gitignore b/.gitignore index c14862e..14ae1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /listen-0.4.7.gem /listen-2.7.9.gem /listen-2.7.11.gem +/listen-3.0.3.gem +/rubygem-listen-3.0.3-tests.tgz diff --git a/listen-2.7.11-Remove-hardcoded-platform-specific-dependencies.patch b/listen-2.7.11-Remove-hardcoded-platform-specific-dependencies.patch deleted file mode 100644 index d14d7e6..0000000 --- a/listen-2.7.11-Remove-hardcoded-platform-specific-dependencies.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/specifications/listen-2.7.11.gemspec -+++ b/specifications/listen-2.7.11.gemspec -@@ -26,8 +26,6 @@ - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0.15.2"]) -- s.add_runtime_dependency(%q, [">= 0.9.3"]) -- s.add_runtime_dependency(%q, [">= 0.9"]) - s.add_development_dependency(%q, [">= 1.3.5"]) - s.add_development_dependency(%q, [">= 0.15.0"]) - s.add_development_dependency(%q, [">= 0"]) -@@ -35,8 +33,6 @@ - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0.15.2"]) -- s.add_dependency(%q, [">= 0.9.3"]) -- s.add_dependency(%q, [">= 0.9"]) - s.add_dependency(%q, [">= 1.3.5"]) - s.add_dependency(%q, [">= 0.15.0"]) - s.add_dependency(%q, [">= 0"]) -@@ -45,8 +41,6 @@ - end - else - s.add_dependency(%q, [">= 0.15.2"]) -- s.add_dependency(%q, [">= 0.9.3"]) -- s.add_dependency(%q, [">= 0.9"]) - s.add_dependency(%q, [">= 1.3.5"]) - s.add_dependency(%q, [">= 0.15.0"]) - s.add_dependency(%q, [">= 0"]) diff --git a/listen-3.0.3-Remove-hardcoded-platform-specific-dependencies.patch b/listen-3.0.3-Remove-hardcoded-platform-specific-dependencies.patch new file mode 100644 index 0000000..f785b28 --- /dev/null +++ b/listen-3.0.3-Remove-hardcoded-platform-specific-dependencies.patch @@ -0,0 +1,25 @@ +diff --git a/listen-3.0.3.gemspec b/listen-3.0.3.gemspec +index 93d3c61..e29ee73 100644 +--- a/specifications/listen-3.0.3.gemspec ++++ b/specifications/listen-3.0.3.gemspec +@@ -25,17 +25,11 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q, [">= 0.9.3"]) +- s.add_runtime_dependency(%q, [">= 0.9"]) + s.add_development_dependency(%q, [">= 1.3.5"]) + else +- s.add_dependency(%q, [">= 0.9.3"]) +- s.add_dependency(%q, [">= 0.9"]) + s.add_dependency(%q, [">= 1.3.5"]) + end + else +- s.add_dependency(%q, [">= 0.9.3"]) +- s.add_dependency(%q, [">= 0.9"]) + s.add_dependency(%q, [">= 1.3.5"]) + end + end +-- +2.5.0 + diff --git a/rubygem-listen.spec b/rubygem-listen.spec index 0678c8d..86e1880 100644 --- a/rubygem-listen.spec +++ b/rubygem-listen.spec @@ -2,13 +2,16 @@ %global gem_name listen Name: rubygem-%{gem_name} -Version: 2.7.11 -Release: 2%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Listen to file modifications Group: Development/Languages License: MIT URL: https://github.com/guard/listen Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# git clone https://github.com/guard/listen.git && cd listen && git checkout v3.0.3 +# tar czvf rubygem-listen-3.0.3-tests.tgz spec +Source1: rubygem-listen-%{version}-tests.tgz # Remove the hardcoded dependencies. We don't have them in Fedora (except rb-inotify), # they are platform specifis and not needed. # https://github.com/guard/listen/pull/54 @@ -16,12 +19,10 @@ Patch0: listen-%{version}-Remove-hardcoded-platform-specific-dependencies.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby -BuildRequires: rubygem(celluloid) BuildRequires: rubygem(rb-inotify) -# BuildRequires: rubygem(celluloid-io) >= 0.15.0 -# BuildRequires: rubygem(rspec) => 3.0.0rc1 -# BuildRequires: rubygem(rspec) < 3.1 -# BuildRequires: rubygem(rspec-retry) +BuildRequires: rubygem(thor) +BuildRequires: rubygem(rspec) => 3.0.0rc1 +BuildRequires: rubygem(rspec) < 3.1 BuildArch: noarch %description @@ -42,6 +43,12 @@ Documentation for %{name}. %setup -q -c -T %gem_install -n %{SOURCE0} +pushd .%{gem_instdir} +# Patch: Avoid Kernel.require +# https://github.com/guard/listen/issues/340 +sed -i -e 's/Kernel.require/require/' ./lib/listen/adapter/linux.rb +popd + pushd .%{gem_dir} %patch0 -p1 popd @@ -60,22 +67,16 @@ cp -pa .%{_bindir}/* \ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x -#%%check -#pushd .%{gem_instdir} -# We don't have celluoid-io, needed by TCP forwarding feature of Listen, -# in Fedora yet => disable the tests. -#sed -i '/listen\/tcp/ s/^/#/' spec/spec_helper.rb -#rm spec/acceptance/tcp_spec.rb -#rm spec/lib/listen/adapter/tcp_spec.rb -#rm -rf spec/lib/listen/tcp -# -#sed -i '/verify_/ s/^/#/' spec/spec_helper.rb -# -#sed -i '/rspec\/retry/,/^end$/ s/^/#/' spec/spec_helper.rb -# -#rspec spec -#popd +%check +# Move the tests into place +tar xzvf %{SOURCE1} -C .%{gem_instdir} +pushd .%{gem_instdir} +# We removed dependencies from other platforms so let's remove +# tests as well +rm spec/lib/listen/adapter/darwin_spec.rb +rspec -Ilib:spec -rspec_helper spec +popd %files %dir %{gem_instdir} @@ -84,11 +85,6 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %doc %{gem_instdir}/LICENSE.txt %{gem_libdir} %exclude %{gem_cache} -%exclude %{gem_instdir}/.gitignore -%exclude %{gem_instdir}/.rspec -%exclude %{gem_instdir}/.rubocop.yml -%exclude %{gem_instdir}/.travis.yml -%exclude %{gem_instdir}/.yardopts %{gem_spec} %files doc @@ -96,13 +92,11 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/README.md %doc %{gem_instdir}/CONTRIBUTING.md -%{gem_instdir}/Rakefile -%{gem_instdir}/Gemfile -%{gem_instdir}/Guardfile -%{gem_instdir}/spec -%{gem_instdir}/%{gem_name}.gemspec %changelog +* Tue Aug 18 2015 Josef Stribny - 3.0.3-1 +- Update to 3.0.3 + * Thu Jun 18 2015 Fedora Release Engineering - 2.7.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 15e3a0e..fcdfaca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -d8affa34efdb950338d4bff114de31ff listen-2.7.11.gem +32cf5b15cfa92293e08906dd43dc4fb4 listen-3.0.3.gem +dffb809f716d7609f46947a1b26e417f rubygem-listen-3.0.3-tests.tgz