aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2013-09-10 13:57:50 (GMT)
committerPascal Terjan <pterjan@gmail.com>2013-09-10 13:57:50 (GMT)
commit756eaa29d2086e36aefb8549a21baba792945869 (patch)
treeb4e534eb49d2ab32abbaacd7ce944d21c093bf74
parentdaca30569be507005ad22264dd11e542a2d22de7 (diff)
Support gems with the .so in a subdirectory1.181
-rw-r--r--NEWS3
-rw-r--r--build.macros.in8
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 724a036..25c9922 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.181 - 10 Sep 2013, by Pascal Terjan
+- Support gems with the .so in a subdirectory
+
Version 1.180 - 10 Sep 2013, by Pascal Terjan
- Create a %gem_setup fixing most common problems
diff --git a/build.macros.in b/build.macros.in
index cec3683..c12586a 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -505,11 +505,11 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
--install-dir %{buildroot}%{ruby_gemdir} \\\
--bindir %{buildroot}%{_bindir} \
rm -fr %{buildroot}%{ruby_gemdir}/{cache,gems/%{__ruby_module_name}-%{version}/ext,gems/%{__ruby_module_name}-%{version}/%{__ruby_module_name}.gemspec} \
+ (cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib ; \\\
+ for f in $(find -name *.so); do \\\
+ mkdir -p %{buildroot}%{ruby_sitearchdir}/$(dirname $f); \\\
+ mv $f %{buildroot}%{ruby_sitearchdir}/$f; done ) \
find %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version} -maxdepth 1 -type f -delete \
- if [ -f %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib/*.so ]; then \
- mkdir -p %{buildroot}%{ruby_sitearchdir} \
- mv %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib/*.so %{buildroot}%{ruby_sitearchdir}/ \
- fi
#------------------------------------------------------------------------------
# Systemd and general service related macros
diff --git a/configure.ac b/configure.ac
index 2a13073..c9d6bd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.180, pterjan@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.181, pterjan@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR