diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2010-10-16 22:00:22 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2010-10-16 22:00:22 +0000 |
| commit | 1720b8034abd23ec029aea892c0aeeec3c8a6eef (patch) | |
| tree | 5a7522cd7856cdcb47c69dc0dbd7b5786c5161bf | |
| parent | c7c4ac2a2e499416eda91d854ae008bb5c16c7c8 (diff) | |
| download | rpm-setup-1720b8034abd23ec029aea892c0aeeec3c8a6eef.tar rpm-setup-1720b8034abd23ec029aea892c0aeeec3c8a6eef.tar.gz rpm-setup-1720b8034abd23ec029aea892c0aeeec3c8a6eef.tar.bz2 rpm-setup-1720b8034abd23ec029aea892c0aeeec3c8a6eef.tar.xz rpm-setup-1720b8034abd23ec029aea892c0aeeec3c8a6eef.zip | |
don't install dependencies for gems when using %gem_install1.109
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | build.macros.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,5 @@ -Version 1.109 - ?? ??????? 2010, by ??? +Version 1.109 - 16 October 2010, by Per Øyvind Karlsen +- don't install dependencies for gems when using %gem_install - fix build with rpm 5.3 Version 1.108 - 16 October 2010, by Per Øyvind Karlsen diff --git a/build.macros.in b/build.macros.in index 1082579..1520d1e 100644 --- a/build.macros.in +++ b/build.macros.in @@ -324,7 +324,7 @@ Requires: python >= %minver, python < %maxver %gem_install(i:n:C) \ DESTDIR=${DESTDIR:-%{buildroot}} \\\ %__gem_helper install \\\ - --env-shebang --rdoc --ri --force \\\ + --env-shebang --rdoc --ri --force --ignore-dependencies \\\ %{!-i:--install-dir %{buildroot}%{ruby_gemdir}}%{-i:--install-dir %{-i*}} \\\ %{!-n:--bindir %{buildroot}%{_bindir}}%{-n:--bindir%{-n*}} \\\ %{!-C:--fix-permissions} diff --git a/configure.ac b/configure.ac index 7fa268a..5e22c11 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.108, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.109, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability) AC_CONFIG_SRCDIR |