diff --git a/rubygem-ferret-0.11.8.4-make-rake-just-development-dependency.patch b/rubygem-ferret-0.11.8.4-make-rake-just-development-dependency.patch index 819a1ef..f8aa23b 100644 --- a/rubygem-ferret-0.11.8.4-make-rake-just-development-dependency.patch +++ b/rubygem-ferret-0.11.8.4-make-rake-just-development-dependency.patch @@ -1,6 +1,6 @@ --- specifications/ferret-0.11.8.4.gemspec +++ specifications/ferret-0.11.8.4.gemspec -@@ -24,7 +24,7 @@ +@@ -28,7 +28,7 @@ s.specification_version = 3 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then diff --git a/rubygem-ferret.spec b/rubygem-ferret.spec index ae8c633..29eca61 100644 --- a/rubygem-ferret.spec +++ b/rubygem-ferret.spec @@ -3,7 +3,7 @@ Summary: Full-featured text search engine library Name: rubygem-%{gem_name} Version: 0.11.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Languages # License from # - MIT-LICENSE: MIT @@ -19,12 +19,9 @@ Patch0: rubygem-ferret-0.11.8.4-Fix-compatibily-with-minitest.patch # https://github.com/jkraemer/ferret/pull/5 Patch1: rubygem-ferret-0.11.8.4-make-rake-just-development-dependency.patch Patch2: rubygem-ferret-0.11.8.4-Block-variables-has-local-scopes.patch -Requires: ruby(release) -Requires: ruby(rubygems) BuildRequires: rubygems-devel BuildRequires: ruby-devel -BuildRequires: rubygem(minitest) -Provides: rubygem(%{gem_name}) = %{version} +BuildRequires: rubygem(minitest) < 5 %description Ferret is a high-performance, full-featured text search @@ -61,8 +58,8 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -mkdir -p %{buildroot}%{gem_extdir_mri}/lib -mv %{buildroot}%{gem_instdir}/lib/ferret_ext.so %{buildroot}%{gem_extdir_mri}/lib/ +mkdir -p %{buildroot}%{gem_extdir_mri} +cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/ mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ @@ -70,8 +67,10 @@ cp -a .%{_bindir}/* \ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x +# Prevent dangling symlink in -debuginfo. +rm -rf %{buildroot}%{gem_instdir}/ext + # Remove executable flags (fix rpmlint warnings). -find .%{gem_instdir}/ext -type f | xargs chmod a-x find %{buildroot}%{gem_instdir}/test -type f | xargs chmod a-x chmod a-x %{buildroot}%{gem_instdir}/Rakefile @@ -92,7 +91,6 @@ popd %{_bindir}/ferret-browser %{gem_instdir}/bin %{gem_libdir} -%exclude %{gem_instdir}/ext %{gem_extdir_mri} %exclude %{gem_cache} %{gem_spec} @@ -110,6 +108,9 @@ popd %{gem_instdir}/test/ %changelog +* Mon Apr 14 2014 Vít Ondruch - 0.11.8.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + * Sun Aug 04 2013 Fedora Release Engineering - 0.11.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild