Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
f20bdd2181 | ||
|
2e0c880ac1 | ||
|
040f5c4647 | ||
|
9b5f563a1f | ||
|
3c93e4e414 | ||
|
b287d141b4 | ||
|
f2dd19ab7a | ||
|
a30c718be3 | ||
|
81945b1b99 | ||
|
32c9f6effd | ||
|
a455283c3b | ||
|
89d4373622 | ||
|
05be8fd465 | ||
|
62780c70d7 | ||
|
30b385f1da |
@ -1,11 +0,0 @@
|
||||
--- specifications/ferret-0.11.8.4.gemspec
|
||||
+++ specifications/ferret-0.11.8.4.gemspec
|
||||
@@ -28,7 +28,7 @@
|
||||
s.specification_version = 3
|
||||
|
||||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
||||
- s.add_runtime_dependency(%q<rake>, [">= 0"])
|
||||
+ s.add_development_dependency(%q<rake>, [">= 0"])
|
||||
else
|
||||
s.add_dependency(%q<rake>, [">= 0"])
|
||||
end
|
14
rubygem-ferret-0.11.8.4-ruby22-hashsize.patch
Normal file
14
rubygem-ferret-0.11.8.4-ruby22-hashsize.patch
Normal 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
|
18
rubygem-ferret-posh.h-aarch64.patch
Normal file
18
rubygem-ferret-posh.h-aarch64.patch
Normal 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 */
|
14
rubygem-ferret-posh.h-s390x.patch
Normal file
14
rubygem-ferret-posh.h-s390x.patch
Normal 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 */
|
@ -3,7 +3,7 @@
|
||||
Summary: Full-featured text search engine library
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 0.11.8.4
|
||||
Release: 8%{?dist}
|
||||
Release: 21%{?dist}
|
||||
Group: Development/Languages
|
||||
# License from
|
||||
# - MIT-LICENSE: MIT
|
||||
@ -17,11 +17,18 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||
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
|
||||
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
|
||||
# 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
|
||||
@ -39,19 +46,24 @@ BuildArch: noarch
|
||||
This package contains documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -c -T
|
||||
%gem_install -n %{SOURCE0}
|
||||
gem unpack %{SOURCE0}
|
||||
%setup -q -D -T -n %{gem_name}-%{version}
|
||||
|
||||
pushd .%{gem_instdir}
|
||||
%patch0 -p2
|
||||
%patch2 -p2
|
||||
popd
|
||||
%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'
|
||||
|
||||
pushd .%{gem_dir}
|
||||
%patch1
|
||||
popd
|
||||
|
||||
%build
|
||||
gem build %{gem_name}.gemspec
|
||||
%gem_install
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{gem_dir}
|
||||
@ -108,6 +120,47 @@ popd
|
||||
%{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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user