diff options
| author | Pascal Terjan <pterjan@gmail.com> | 2013-12-27 21:41:53 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2013-12-27 21:41:53 +0000 |
| commit | 2c8bf7c82a0e0259bb2827fde095b5557c9ee020 (patch) | |
| tree | a6abfcda65729a7608f42cbc771c6bb91e3468cb | |
| parent | b7b75f31a616ffcafd6ba599cb16b716099e8b42 (diff) | |
| download | rpm-setup-2c8bf7c82a0e0259bb2827fde095b5557c9ee020.tar rpm-setup-2c8bf7c82a0e0259bb2827fde095b5557c9ee020.tar.gz rpm-setup-2c8bf7c82a0e0259bb2827fde095b5557c9ee020.tar.bz2 rpm-setup-2c8bf7c82a0e0259bb2827fde095b5557c9ee020.tar.xz rpm-setup-2c8bf7c82a0e0259bb2827fde095b5557c9ee020.zip | |
Use correct macro for gems dir now that rubygems moved1.196
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | build.macros.in | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,6 @@ +Version 1.196 - 27 Dec 2013, by Pascal Terjan +- Use correct macro for gems dir now that rubygems moved + Version 1.195 - 24 Dec 2013, by Pascal Terjan - Fix mistake in previous version diff --git a/build.macros.in b/build.macros.in index f0d222c..864b14f 100644 --- a/build.macros.in +++ b/build.macros.in @@ -512,7 +512,7 @@ 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} \\\ + --install-dir %{buildroot}%{gem_dir} \\\ --bindir %{buildroot}%{_bindir} \ EXTPATH=$(ruby -e "puts Gem::Specification.load('%{__ruby_module_name}.gemspec').require_paths.join(' ')") \ %{-d: \ @@ -526,7 +526,7 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\ 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} \ + rm -fr %{buildroot}%{gem_dir}/{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 #------------------------------------------------------------------------------ diff --git a/configure.ac b/configure.ac index 6379247..f7d6a7b 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.195, pterjan@mageia.org) +AC_INIT(rpm-mageia-setup, 1.196, pterjan@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR |