Compare commits
No commits in common. "master" and "EL-4-start" have entirely different histories.
master
...
EL-4-start
0
.cvsignore
Normal file
0
.cvsignore
Normal file
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
||||
ferret-0.11.6.gem
|
||||
/ferret-0.11.8.4.gem
|
21
Makefile
Normal file
21
Makefile
Normal file
@ -0,0 +1,21 @@
|
||||
# Makefile for source rpm: rubygem-ferret
|
||||
# $Id$
|
||||
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 $$/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)
|
@ -1,29 +0,0 @@
|
||||
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
|
||||
|
@ -1,24 +0,0 @@
|
||||
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
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- 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
|
@ -1,18 +0,0 @@
|
||||
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 */
|
@ -1,14 +0,0 @@
|
||||
--- 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 */
|
@ -1,217 +0,0 @@
|
||||
%global gem_name ferret
|
||||
|
||||
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://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
|
||||
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}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
This package contains documentation for %{name}.
|
||||
|
||||
%prep
|
||||
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
|
||||
gem build %{gem_name}.gemspec
|
||||
%gem_install
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{gem_dir}
|
||||
cp -a .%{gem_dir}/* \
|
||||
%{buildroot}%{gem_dir}/
|
||||
|
||||
mkdir -p %{buildroot}%{gem_extdir_mri}
|
||||
cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
|
||||
|
||||
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
|
||||
|
||||
|
||||
%check
|
||||
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
|
||||
|
||||
|
||||
%files
|
||||
%dir %{gem_instdir}
|
||||
%doc %{gem_instdir}/MIT-LICENSE
|
||||
%{_bindir}/ferret-browser
|
||||
%{gem_instdir}/bin
|
||||
%{gem_libdir}
|
||||
%{gem_extdir_mri}
|
||||
%exclude %{gem_cache}
|
||||
%{gem_spec}
|
||||
|
||||
%files doc
|
||||
%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
|
||||
|
||||
* Sun Apr 05 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.11.6-9
|
||||
- Update from comments in #468597
|
||||
- Update to reflect new package guidelines
|
||||
|
||||
* Wed Oct 29 2008 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.11.6-7
|
||||
- Adjust license tag for package (#468597)
|
||||
- Adjust Source0 URL (#468597)
|
||||
- Make sure that the gem installation dir itself is owned by this package (#468597)
|
||||
|
||||
* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.11.6-6
|
||||
- Majorly revise packaging strategy (#468597)
|
||||
- Found all licenses in each of the files
|
||||
- Include license file
|
||||
|
||||
* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.11.6-2
|
||||
- Better use of macros
|
||||
- rpmlint now silent
|
||||
|
||||
* Sun Oct 25 2008 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 0.11.6-1
|
||||
- Initial package
|
Loading…
Reference in New Issue
Block a user