diff options
| author | Pascal Terjan <pterjan@gmail.com> | 2013-09-20 12:23:20 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2013-09-20 12:23:20 +0000 |
| commit | fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8 (patch) | |
| tree | ddd2f00c0f2701dc5bca4902658b31a12eb3dbef | |
| parent | d88e168a614b84ce54fb56d5091faa4253ed4f6b (diff) | |
| download | rpm-setup-fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8.tar rpm-setup-fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8.tar.gz rpm-setup-fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8.tar.bz2 rpm-setup-fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8.tar.xz rpm-setup-fd3fb4e09a2bf1c961ccf85cee067b2a75e4ada8.zip | |
Support gems with .so under ext and not installed in lib1.186
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | build.macros.in | 10 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,6 @@ +Version 1.186 - 20 Sep 2013, by Pascal Terjan +- Support gems with .so not under lib/ + Version 1.185 - 20 Sep 2013, by Pascal Terjan - Fix typo in previous version :( diff --git a/build.macros.in b/build.macros.in index 17eb286..ffba1b9 100644 --- a/build.macros.in +++ b/build.macros.in @@ -505,11 +505,13 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\ --env-shebang --rdoc --ri --force --ignore-dependencies \\\ --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} \ - ([ -d %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib ] && cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib ; \\\ + (cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}; \\\ for f in $(find -name '*.so'); do \\\ - mkdir -p %{buildroot}%{ruby_sitearchdir}/$(dirname $f); \\\ - mv $f %{buildroot}%{ruby_sitearchdir}/$f; done ) \ + dest=${f##./ext/}; \\\ + dest=${dest##./lib/}; \\\ + mkdir -p %{buildroot}%{ruby_sitearchdir}/$(dirname $dest); \\\ + mv $f %{buildroot}%{ruby_sitearchdir}/$dest; done ) \ + rm -fr %{buildroot}%{ruby_gemdir}/{cache,gems/%{__ruby_module_name}-%{version}/ext,gems/%{__ruby_module_name}-%{version}/%{__ruby_module_name}.gemspec} \ find %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version} -maxdepth 1 -type f -delete \ #------------------------------------------------------------------------------ diff --git a/configure.ac b/configure.ac index ccb1a09..6e36cd6 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.185, pterjan@mageia.org) +AC_INIT(rpm-mageia-setup, 1.186, pterjan@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR |