From 1720b8034abd23ec029aea892c0aeeec3c8a6eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Sat, 16 Oct 2010 22:00:22 +0000 Subject: don't install dependencies for gems when using %gem_install --- NEWS | 3 ++- build.macros.in | 2 +- configure.ac | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index fd528d9..1fa9316 100644 --- a/NEWS +++ b/NEWS @@ -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 -- cgit v1.2.1