[packages/hyperestraier] - install ruby to vendor dirs - rel 4

baggins baggins at pld-linux.org
Tue Jun 11 23:38:24 CEST 2013


commit d449704d58eea9d2ad567ea2698623652222e69e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jun 11 23:38:08 2013 +0200

    - install ruby to vendor dirs
    - rel 4

 hyperestraier.spec |  8 +++++---
 ruby-vendor.patch  | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/hyperestraier.spec b/hyperestraier.spec
index 403bd03..160e5c9 100644
--- a/hyperestraier.spec
+++ b/hyperestraier.spec
@@ -12,7 +12,7 @@ Summary:	Full-text search system
 Summary(pl.UTF-8):	Pełnotekstowy system wyszukiwawczy
 Name:		hyperestraier
 Version:	1.4.13
-Release:	3
+Release:	4
 License:	LGPL v2.1+
 Group:		Applications/Text
 Source0:	http://downloads.sourceforge.net/hyperestraier/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Source0:	http://downloads.sourceforge.net/hyperestraier/%{name}-%{version}.tar.g
 Source1:	%{name}.sh
 Patch0:		%{name}-am_ac.patch
 Patch1:		%{name}-ruby1.9.patch
+Patch2:		ruby-vendor.patch
 URL:		http://hyperestraier.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -167,6 +168,7 @@ Wiązania języka Ruby do hyperestraiera w czystym Rubym.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -336,10 +338,10 @@ rm -rf $RPM_BUILD_ROOT
 %files rubynative
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/estcmd.rb
-%attr(755,root,root) %{ruby_sitearchdir}/estraier.so
+%attr(755,root,root) %{ruby_vendorarchdir}/estraier.so
 
 %files rubypure
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/estcall.rb
-%{ruby_sitelibdir}/estraierpure.rb
+%{ruby_vendorlibdir}/estraierpure.rb
 %endif
diff --git a/ruby-vendor.patch b/ruby-vendor.patch
new file mode 100644
index 0000000..366adb9
--- /dev/null
+++ b/ruby-vendor.patch
@@ -0,0 +1,28 @@
+--- hyperestraier-1.4.13/rubynative/configure.in~	2013-06-11 23:27:12.288844221 +0200
++++ hyperestraier-1.4.13/rubynative/configure.in	2013-06-11 23:33:32.249382172 +0200
+@@ -46,12 +46,12 @@
+ printf '%s\n' "$RDOC"
+ 
+ # Librarh path
+-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorlibdir"))'`
+ if test -n "$myrblibdir"
+ then
+   MYRBLIBDIR="$myrblibdir"
+ fi
+-myrbarchdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitearchdir"))'`
++myrbarchdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorarchdir"))'`
+ if test -n "$myrbarchdir"
+ then
+   MYRBARCHDIR="$myrbarchdir"
+--- hyperestraier-1.4.13/rubypure/configure.in~	2013-06-11 23:27:12.288844221 +0200
++++ hyperestraier-1.4.13/rubypure/configure.in	2013-06-11 23:33:56.969634098 +0200
+@@ -45,7 +45,7 @@
+ printf '%s\n' "$RDOC"
+ 
+ # Librarh path
+-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("vendorlibdir"))'`
+ if test -n "$myrblibdir"
+ then
+   MYRBLIBDIR="$myrblibdir"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hyperestraier.git/commitdiff/d449704d58eea9d2ad567ea2698623652222e69e



More information about the pld-cvs-commit mailing list