aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fundawang@gmail.com>2013-09-28 21:51:47 +0800
committerFunda Wang <fundawang@gmail.com>2013-09-28 21:51:47 +0800
commitbc4afb1d852ecce5bc17b8329bbcf076e45ab28d (patch)
tree2c78a3046d249407e9ddb086b8dcad0d35f5749c
parent13cbc25294142ac1a1eeb7419dabc702a212972d (diff)
downloadrpm-setup-bc4afb1d852ecce5bc17b8329bbcf076e45ab28d.tar
rpm-setup-bc4afb1d852ecce5bc17b8329bbcf076e45ab28d.tar.gz
rpm-setup-bc4afb1d852ecce5bc17b8329bbcf076e45ab28d.tar.bz2
rpm-setup-bc4afb1d852ecce5bc17b8329bbcf076e45ab28d.tar.xz
rpm-setup-bc4afb1d852ecce5bc17b8329bbcf076e45ab28d.zip
add switch -d to gem_install to move headers into vendorarchdir1.190
-rw-r--r--NEWS3
-rw-r--r--build.macros.in8
-rw-r--r--configure.ac2
3 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c7bffe3..2727df8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.190 - 28 Sep 2013, by Funda Wang
+- add switch -d to gem_install to move headers into vendorarchdir
+
Version 1.189 - 25 Sep 2013, by Philippe Makowski
- Set valid macros names for Python byte compilation
diff --git a/build.macros.in b/build.macros.in
index d0e473a..2edb153 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -508,11 +508,17 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
fi \
%{_bindir}/gem build %{__ruby_module_name}.gemspec
-%gem_install \
+%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} \
+ %{-d: \
+ mkdir -p %{buildroot}%{ruby_vendorarchdir} \
+ for f in $(find %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/ext -name *.h); do \
+ mv $f %{buildroot}%{ruby_vendorarchdir}/ \
+ done \
+ } \
(cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}; \\\
for f in $(find -name '*.so'); do \\\
dest=${f##./ext/}; \\\
diff --git a/configure.ac b/configure.ac
index cf393a8..976123d 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.189, philippem@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.190, philippem@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR