plautrba pushed to libselinux (f21). "Use ruby_vendorarchdir provided by ruby-devel. (#923649)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 21 15:48:55 UTC 2015


>From 013b6729cda61ac9990b0f95186ac1d7f7a7be3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Wed, 20 Mar 2013 10:31:48 +0100
Subject: Use ruby_vendorarchdir provided by ruby-devel. (#923649)


diff --git a/libselinux.spec b/libselinux.spec
index 52fd09d..30cedd4 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -3,7 +3,6 @@
 %endif
 
 %define ruby_inc %(pkg-config --cflags ruby)
-%define ruby_sitearch %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
 %define libsepolver 2.1.9-1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
@@ -157,7 +156,7 @@ InstallPythonWrapper %{__python}
 InstallPythonWrapper %{__python3}
 %endif # with_python3
 
-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}%{_libdir}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" RUBYINSTALL=%{buildroot}%{ruby_sitearch} install install-rubywrap
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}%{_libdir}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" RUBYINSTALL=%{buildroot}%{ruby_vendorarchdir} install install-rubywrap
 
 # Nuke the files we don't want to distribute
 rm -f %{buildroot}%{_sbindir}/compute_*
@@ -240,7 +239,7 @@ rm -rf %{buildroot}
 
 %files ruby
 %defattr(-,root,root,-)
-%{ruby_sitearch}/selinux.so
+%{ruby_vendorarchdir}/selinux.so
 
 %changelog
 * Mon Jan 19 2015 Vít Ondruch <vondruch at redhat.com> - 2.3-6
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libselinux.git/commit/?h=f21&id=013b6729cda61ac9990b0f95186ac1d7f7a7be3e


More information about the scm-commits mailing list