aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2013-09-20 11:21:43 +0000
committerPascal Terjan <pterjan@gmail.com>2013-09-20 11:21:43 +0000
commitb608633a56f8d928d99fa5efc894faf8f6d3801c (patch)
tree35b942b1bebf41d62536703e44c7cd3da4bfafc4
parent4cddaab45e4687453be733d48e0a6d46efacce69 (diff)
downloadrpm-setup-b608633a56f8d928d99fa5efc894faf8f6d3801c.tar
rpm-setup-b608633a56f8d928d99fa5efc894faf8f6d3801c.tar.gz
rpm-setup-b608633a56f8d928d99fa5efc894faf8f6d3801c.tar.bz2
rpm-setup-b608633a56f8d928d99fa5efc894faf8f6d3801c.tar.xz
rpm-setup-b608633a56f8d928d99fa5efc894faf8f6d3801c.zip
Support empty gems1.184
-rw-r--r--NEWS3
-rw-r--r--build.macros.in2
-rw-r--r--configure.ac2
3 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 9625672..815f858 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.184 - 20 Sep 2013, by Pascal Terjan
+- Support empty gems
+
Version 1.183 - 20 Sep 2013, by Pascal Terjan
- Handle another git ls-files syntax in gem_setup
- Fix dependency generation when ruby_version is empty
diff --git a/build.macros.in b/build.macros.in
index f4bb17a..ac2762a 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -506,7 +506,7 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
--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} \
- (cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib ; \\\
+ ([ -d %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib && cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/lib ; \\\
for f in $(find -name '*.so'); do \\\
mkdir -p %{buildroot}%{ruby_sitearchdir}/$(dirname $f); \\\
mv $f %{buildroot}%{ruby_sitearchdir}/$f; done ) \
diff --git a/configure.ac b/configure.ac
index 49252d8..e67bf5f 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.183, pterjan@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.184, pterjan@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR