aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-16 22:00:22 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-16 22:00:22 +0000
commit1720b8034abd23ec029aea892c0aeeec3c8a6eef (patch)
tree5a7522cd7856cdcb47c69dc0dbd7b5786c5161bf
parentc7c4ac2a2e499416eda91d854ae008bb5c16c7c8 (diff)
downloadrpm-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--NEWS3
-rw-r--r--build.macros.in2
-rw-r--r--configure.ac2
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