aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2013-12-24 12:10:13 (GMT)
committerPascal Terjan <pterjan@gmail.com>2013-12-24 12:10:13 (GMT)
commitc7b3c8d597befa0c0cc78564b1a88680bacfbc5a (patch)
tree62263bd984bbf182671b89c10d88bd4e70738e36
parent49171d92307b2176160bcdc2f8a314a2a853d40a (diff)
Only install gem .so from paths in require_paths1.194
-rw-r--r--NEWS3
-rw-r--r--build.macros.in25
-rw-r--r--configure.ac2
3 files changed, 17 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index 3a3e54c..b4bd2b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.194 - 24 Dec 2013, by Pascal Terjan
+- Only install gem .so from paths in require_paths
+
Version 1.193 - 17 Dec 2013, by Pascal Terjan
- Improve binary gems handling and get more compatible with Fedora
diff --git a/build.macros.in b/build.macros.in
index 1036db5..04000ea 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -511,22 +511,23 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
%gem_install(d) \
%{_bindir}/gem install %{__ruby_module_name}-%{version}.gem --local \\\
- --env-shebang --rdoc --ri --force --ignore-dependencies \\\
- --install-dir %{buildroot}%{ruby_gemdir} \\\
- --bindir %{buildroot}%{_bindir} \
+ --env-shebang --rdoc --ri --force --ignore-dependencies \\\
+ --install-dir %{buildroot}%{ruby_gemdir} \\\
+ --bindir %{buildroot}%{_bindir} \
+ EXTPATH=$(ruby -e "puts Gem::Specification.new('%{__ruby_module_name}.gemspec').require_paths.join(' ')") \
%{-d: \
- (cd %{buildroot}%{gem_instdir}; \\\
- for f in $(find -name *.h); do \\\
- mkdir -p %{buildroot}%{gem_extdir_mri}/$(dirname $f); \\\
- mv $f %{buildroot}%{gem_extdir_mri}/$f; \\\
- done ) \
+ (cd %{buildroot}%{gem_instdir}; \\\
+ for f in $(find $EXTPATH -name *.h); do \\\
+ mkdir -p %{buildroot}%{gem_extdir_mri}/$(dirname $f); \\\
+ mv $f %{buildroot}%{gem_extdir_mri}/$f; \\\
+ done ) \
} \
(cd %{buildroot}%{gem_instdir}; \\\
- for f in $(find -name '*.so'); do \\\
- mkdir -p %{buildroot}%{gem_extdir_mri}/$(dirname $f); \\\
- mv $f %{buildroot}%{gem_extdir_mri}/$f; done ) \
+ for f in $(find $EXTPATH -name '*.so'); do \\\
+ mkdir -p %{buildroot}%{gem_extdir_mri}/$(dirname $f); \\\
+ mv $f %{buildroot}%{gem_extdir_mri}/$f; done ) \
rm -fr %{buildroot}%{ruby_gemdir}/{cache,gems/%{__ruby_module_name}-%{version}/ext,gems/%{__ruby_module_name}-%{version}/%{__ruby_module_name}.gemspec} \
- find %{buildroot}%{gem_instdir} -maxdepth 1 -type f -delete \
+ find %{buildroot}%{gem_instdir} -maxdepth 1 -type f -delete
#------------------------------------------------------------------------------
# Systemd and general service related macros
diff --git a/configure.ac b/configure.ac
index c7d1e3c..5a660c6 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.193, pterjan@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.194, pterjan@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR