[packages/libcaca] ruby: use vendordir
glen
glen at pld-linux.org
Mon Jul 28 11:18:04 CEST 2014
commit d4220a3aef9c284943e019bf953dcec1172500ae
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jul 28 11:54:53 2014 +0300
ruby: use vendordir
libcaca.spec | 9 +++++----
ruby-vendordir.patch | 13 +++++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/libcaca.spec b/libcaca.spec
index 3d5d408..4fe549e 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -23,6 +23,7 @@ Group: Libraries
Source0: http://caca.zoy.org/raw-attachment/wiki/libcaca/%{name}-%{version}.%{subver}.tar.gz
# Source0-md5: a3d4441cdef488099f4a92f4c6c1da00
Patch0: %{name}-monodir.patch
+Patch1: ruby-vendordir.patch
URL: http://caca.zoy.org/
BuildRequires: OpenGL-devel
BuildRequires: autoconf >= 2.50
@@ -230,7 +231,6 @@ Summary: Ruby bindings for libcaca
Summary(pl.UTF-8): Wiązania języka Ruby do libcaca
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-%{?ruby_ver_requires_eq}
%description -n ruby-caca
Ruby bindings for libcaca.
@@ -241,6 +241,7 @@ Wiązania języka Ruby do libcaca.
%prep
%setup -q -n %{name}-%{version}.%{subver}
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -284,7 +285,7 @@ echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacademo.1
# loadable modules
%{__rm} $RPM_BUILD_ROOT%{_libdir}/caca/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/*.la
%if %{with java}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcaca-java.la
%endif
@@ -396,5 +397,5 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-caca
%defattr(644,root,root,755)
-%{ruby_sitelibdir}/caca.rb
-%attr(755,root,root) %{ruby_sitearchdir}/caca.so
+%{ruby_vendorlibdir}/caca.rb
+%attr(755,root,root) %{ruby_vendorarchdir}/caca.so
diff --git a/ruby-vendordir.patch b/ruby-vendordir.patch
new file mode 100644
index 0000000..2c615d0
--- /dev/null
+++ b/ruby-vendordir.patch
@@ -0,0 +1,13 @@
+--- libcaca-0.99.beta19/configure.ac~ 2014-05-16 22:07:53.000000000 +0300
++++ libcaca-0.99.beta19/configure.ac 2014-07-28 10:58:16.493153286 +0300
+@@ -467,8 +467,8 @@
+ if test "${RUBY}" != "no"; then
+ RUBY_CFLAGS="$(ruby -r mkmf -e 'conf = RbConfig::CONFIG.merge("hdrdir" => $hdrdir, "arch_hdrdir" => $arch_hdrdir); print RbConfig::expand("#$INCFLAGS", conf)')"
+ RUBY_LIBS="-L$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
+- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitearchdir"@:>@'`
+- RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"sitelibdir"@:>@'`
++ RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"vendorarchdir"@:>@'`
++ RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print RbConfig::CONFIG@<:@"vendorlibdir"@:>@'`
+ AC_SUBST(RUBY_CFLAGS)
+ AC_SUBST(RUBY_LIBS)
+ AC_SUBST(RUBY_SITEARCHDIR)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcaca.git/commitdiff/7c53efdd66b4177c8afbae12fd582f72b35339bf
More information about the pld-cvs-commit
mailing list