Compare commits

...

27 Commits

Author SHA1 Message Date
Fedora Release Engineering f20bdd2181 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 13:55:05 +00:00
Björn Esser 2e0c880ac1
Rebuilt for switch to libxcrypt 2018-01-20 23:07:56 +01:00
Mamoru TASAKA 040f5c4647 F-28: rebuild for ruby25
s390x fix for posh.h
2018-01-04 18:02:02 +09:00
Mamoru TASAKA 9b5f563a1f F-28: rebuild for ruby25 2018-01-04 15:50:57 +09:00
Fedora Release Engineering 3c93e4e414 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 07:53:42 +00:00
Fedora Release Engineering b287d141b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 17:08:34 +00:00
Fedora Release Engineering f2dd19ab7a - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 12:13:27 +00:00
Vít Ondruch a30c718be3 Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4 2017-01-10 15:53:57 +01:00
Vít Ondruch 81945b1b99 Fix FTBFS due to updated RubyGems. 2017-01-10 15:53:57 +01:00
Fedora Release Engineering 32c9f6effd - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 22:42:03 +00:00
Vít Ondruch a455283c3b Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 2016-01-08 17:55:18 +01:00
Dennis Gilmore 89d4373622 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-18 23:04:29 +00:00
Peter Robinson 05be8fd465 add aarch64 definitions to posh.h to fix FTBFS 2015-01-27 09:08:19 +00:00
Mamoru TASAKA 62780c70d7 need test/unit 2015-01-18 03:04:27 +09:00
Mamoru TASAKA 30b385f1da Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
- Fix RHASH_SIZE related fix failure
2015-01-18 02:58:16 +09:00
Peter Robinson cf4c5a985e - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 00:39:12 +00:00
Dennis Gilmore d50e74e59d - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 23:00:08 -05:00
Vít Ondruch ac87416abd Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 2014-04-14 13:30:43 +02:00
Dennis Gilmore 9b61c6fe8d - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 08:51:50 -05:00
Bohuslav Kabrda 5f98d4e986 Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 2013-03-22 09:29:09 +01:00
Dennis Gilmore 814ae546be - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 16:36:59 -06:00
Dennis Gilmore 82666b03e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 12:51:46 -05:00
Vít Ondruch 0bbcb78ac1 Update to ferret 0.11.8.4.
Rebuilt for Ruby 1.9.3.
2012-05-16 10:21:06 +02:00
Vít Ondruch 8c932758df Update to ferret 0.11.8.4.
Rebuilt for Ruby 1.9.3.
2012-05-16 10:07:57 +02:00
Dennis Gilmore 83d4895610 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 21:09:29 -06:00
Dennis Gilmore eef129ef33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-09 03:50:03 -06:00
Fedora Release Engineering cf90947ed8 dist-git conversion 2010-07-29 11:50:16 +00:00
11 changed files with 263 additions and 102 deletions

View File

@ -1 +0,0 @@
ferret-0.11.6.gem

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
ferret-0.11.6.gem
/ferret-0.11.8.4.gem

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: rubygem-ferret
# $Id: Makefile,v 1.1 2009/04/07 03:18:29 kevin Exp $
NAME := rubygem-ferret
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -1 +0,0 @@
rubygem-ferret-0_11_6-9_fc11:HEAD:rubygem-ferret-0.11.6-9.fc11.src.rpm:1240390995

View File

@ -0,0 +1,29 @@
From 9c0b8770470c3a5f623f0727f9552834f4ae8abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <v.ondruch@tiscali.cz>
Date: Wed, 16 May 2012 10:55:16 +0300
Subject: [PATCH] Block variables has local scopes.
Fix to be compatible with Ruby 1.9.
---
ruby/bin/ferret-browser | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruby/bin/ferret-browser b/ruby/bin/ferret-browser
index add19c5..790ec0d 100755
--- a/ruby/bin/ferret-browser
+++ b/ruby/bin/ferret-browser
@@ -16,9 +16,9 @@ opts = OptionParser.new do |opts|
opts.separator "Specific Options:"
opts.on("-h", "--host HOSTNAME",
- "Host for web server to bind to (default is all IPs)") { |conf.host| }
+ "Host for web server to bind to (default is all IPs)") { |host| conf.host = host }
opts.on("-p", "--port NUM",
- "Port for web server (defaults to #{conf.port})") { |conf.port| }
+ "Port for web server (defaults to #{conf.port})") { |port| conf.port = port }
opts.on("-s", "--server NAME",
"Server to force (#{SERVER_OPTIONS.join(', ')}).") { |s| conf.server = s.to_sym }
--
1.7.10.1

View File

@ -0,0 +1,24 @@
From fa3e1bee3f49b767278957068096261079aaf5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <v.ondruch@tiscali.cz>
Date: Tue, 15 May 2012 14:40:24 +0300
Subject: [PATCH] Fix compatibily with minitest.
---
ruby/test/unit/tc_field_symbol.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruby/test/unit/tc_field_symbol.rb b/ruby/test/unit/tc_field_symbol.rb
index 9229934..b1ba00c 100644
--- a/ruby/test/unit/tc_field_symbol.rb
+++ b/ruby/test/unit/tc_field_symbol.rb
@@ -21,6 +21,6 @@ class FieldSymbolTest < Test::Unit::TestCase
assert_equal(field_type, :sym.__send__(field_type).type)
end
- assert(:string, :sym.integer.byte.float.string.type)
+ assert(:string, :sym.integer.byte.float.string.type.to_s)
end
end
--
1.7.10.1

View File

@ -0,0 +1,14 @@
--- ferret-0.11.8.4/ext/r_analysis.c.ruby22hash 2015-01-18 02:41:02.096371434 +0900
+++ ferret-0.11.8.4/ext/r_analysis.c 2015-01-18 02:46:51.435722105 +0900
@@ -65,7 +65,11 @@
frb_rb_hash_size(VALUE hash)
{
#ifdef FRT_RUBY_VERSION_1_9
+#ifdef RHASH_SIZE
+ return RHASH_SIZE(hash);
+#else
return RHASH(hash)->ntbl->num_entries;
+#endif
#else
return RHASH(hash)->tbl->num_entries;
#endif

View File

@ -0,0 +1,18 @@
Index: ferret-0.11.8.4/ext/posh.h
===================================================================
--- ferret-0.11.8.4.orig/ext/posh.h
+++ ferret-0.11.8.4/ext/posh.h
@@ -512,6 +512,13 @@ Metrowerks:
# define POSH_CPU_STRING "PA-RISC"
#endif
+#if defined __aarch64__ || defined __arm64__ || defined FORCE_DOXYGEN
+# define POSH_CPU_AARCH64 /**<if defined, target CPU is AArch64 */
+# if !defined FORCE_DOXYGEN
+# define POSH_CPU_STRING "AArch64"
+# endif
+#endif
+
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */

View File

@ -0,0 +1,14 @@
--- ferret-0.11.8.4/ext/posh.h.s390x 2018-01-04 17:41:28.554656256 +0900
+++ ferret-0.11.8.4/ext/posh.h 2018-01-04 17:47:46.769599536 +0900
@@ -519,6 +519,11 @@
# endif
#endif
+#if defined __s390__
+# define POSH_CPU_S390 1
+# define POSH_CPU_STRING "S/390"
+#endif
+
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */

View File

@ -1,29 +1,34 @@
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname ferret
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global gem_name ferret
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
Summary: Full-featured text search engine library
Name: rubygem-%{gemname}
Version: 0.11.6
Release: 10%{?dist}
Group: Development/Languages
Summary: Full-featured text search engine library
Name: rubygem-%{gem_name}
Version: 0.11.8.4
Release: 21%{?dist}
Group: Development/Languages
# License from
# - MIT-LICENSE: MIT
# - ext/posh.c: 3-clause BSD
# - ext/q_parser.c: GPLv2+
License: MIT and BSD
URL: http://rubyforge.org/projects/ferret/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygems
Requires: ruby(abi) = 1.8
BuildRequires: rubygems
BuildRequires: ruby-devel
BuildRequires: rubygem(rake)
Provides: rubygem(%{gemname}) = %{version}
License: MIT and BSD
URL: http://github.com/jkraemer/ferret
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
# Fix compatibility with minitest. Already accepted by upstream.
# https://github.com/jkraemer/ferret/pull/3
Patch0: rubygem-ferret-0.11.8.4-Fix-compatibily-with-minitest.patch
# Rake should not be runtime requirement.
# https://github.com/jkraemer/ferret/pull/5
Patch2: rubygem-ferret-0.11.8.4-Block-variables-has-local-scopes.patch
# See https://bugs.ruby-lang.org/issues/9889
Patch3: rubygem-ferret-0.11.8.4-ruby22-hashsize.patch
# fix build on aarch64
Patch4: rubygem-ferret-posh.h-aarch64.patch
# s390x build
# from http://pkg-ruby-extras-maintainers.alioth.debian.narkive.com/fQZGgAAD/dre-maint-rc-bug-474724
Patch5: rubygem-ferret-posh.h-s390x.patch
BuildRequires: rubygems-devel
BuildRequires: ruby-devel
BuildRequires: rubygem(minitest) < 5
BuildRequires: rubygem(test-unit)
%description
Ferret is a high-performance, full-featured text search
@ -31,84 +36,162 @@ engine library written entirely in pure Ruby (with an
optional C extension). It is inspired by the Java Lucene
Project.
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%package doc
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
%description doc
This package contains documentation for %{name}.
#%package devel
#Requires: rubygem-%{gemname} = %{version}-%{release}
#Group: Development/Languages
#Summary: Development files for rubygem-ferret
#%description devel
#Ferret is a high-performance, full-featured text search
#engine library written entirely in pure Ruby (with an
#optional C extension). It is inspired by the Java Lucene
#Project. These are the devel files.
%prep
%setup -q -c -T
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
%patch0 -p2
%patch2 -p2
%patch3 -p1
%patch4 -p1
%patch5 -p1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%gemspec_remove_dep -g rake '>= 0'
%gemspec_add_dep -d -g rake '>= 0'
%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
--local \
--install-dir ./%{gemdir} \
-V --force \
%{SOURCE0}
gem build %{gem_name}.gemspec
%gem_install
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}
mkdir -p %{buildroot}%{gem_dir}
cp -a .%{gem_dir}/* \
%{buildroot}%{gem_dir}/
install -d -m0755 %{buildroot}%{ruby_sitearch}
mv %{buildroot}%{geminstdir}/lib/ferret_ext.so %{buildroot}%{ruby_sitearch}
mkdir -p %{buildroot}%{gem_extdir_mri}
cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
# You know ferret_ext.so needs to be 755 for find-debuginfo.sh to find it
chmod 0755 %{buildroot}%{ruby_sitearch}/ferret_ext.so
mkdir -p %{buildroot}%{_bindir}
cp -a .%{_bindir}/* \
%{buildroot}%{_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 %{buildroot}%{gem_instdir}/test -type f | xargs chmod a-x
chmod a-x %{buildroot}%{gem_instdir}/Rakefile
rm -rf %{buildroot}%{geminstdir}/ext
mkdir -p %{buildroot}/%{_bindir}
mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
rmdir %{buildroot}%{gemdir}/bin
%check
# Tests fail on ppc64, so make it fail softly
pushd .%{geminstdir}
rake test_units || :
pushd .%{gem_instdir}
# Disable buffer overflow failing test
# https://github.com/jkraemer/ferret/issues/2
sed -i '67d' test/unit/index/tc_index_writer.rb
ruby test/test_all.rb
popd
%clean
rm -rf %{buildroot}
%files
%defattr(-, root, root, -)
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/MIT-LICENSE
%doc %{geminstdir}/README
%doc %{geminstdir}/TODO
%doc %{geminstdir}/TUTORIAL
%dir %{gem_instdir}
%doc %{gem_instdir}/MIT-LICENSE
%{_bindir}/ferret-browser
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/bin
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{ruby_sitearch}/ferret_ext.so
%{gem_instdir}/bin
%{gem_libdir}
%{gem_extdir_mri}
%exclude %{gem_cache}
%{gem_spec}
%files doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/test/
%doc %{gem_docdir}
%doc %{gem_instdir}/CHANGELOG
%doc %{gem_instdir}/README
%doc %{gem_instdir}/RELEASE_CHANGES
%doc %{gem_instdir}/RELEASE_NOTES
%doc %{gem_instdir}/TODO
%doc %{gem_instdir}/TUTORIAL
%{gem_instdir}/Rakefile
%{gem_instdir}/setup.rb
%{gem_instdir}/test/
%changelog
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8.4-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 0.11.8.4-20
- Rebuilt for switch to libxcrypt
* Thu Jan 04 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.8.4-19
- F-28: rebuild for ruby25
- s390x fix for posh.h
* Thu Jan 04 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.8.4-18
- F-28: rebuild for ruby25
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8.4-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Jan 10 2017 Vít Ondruch <vondruch@redhat.com> - 0.11.8.4-14
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.8.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 08 2016 Vít Ondruch <vondruch@redhat.com> - 0.11.8.4-12
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Jan 26 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.11.8.4-10
- add aarch64 definitions to posh.h to fix FTBFS
* Sun Jan 18 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.8.4-9
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
- Fix RHASH_SIZE related fix failure
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Apr 14 2014 Vít Ondruch <vondruch@redhat.com> - 0.11.8.4-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Mar 22 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 0.11.8.4-4
- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue May 15 2012 Vít Ondruch <vondruch@redhat.com> - 0.11.8.4-1
- Update to ferret 0.11.8.4.
- Rebuilt for Ruby 1.9.3.
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

View File

@ -1 +1 @@
f26e531d3c0da085d7461a3648e2974f ferret-0.11.6.gem
10e1e8477ea4a35cbedc46fa7b8d7e0d ferret-0.11.8.4.gem