aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2013-12-17 17:12:09 +0000
committerPascal Terjan <pterjan@gmail.com>2013-12-17 17:12:09 +0000
commit49171d92307b2176160bcdc2f8a314a2a853d40a (patch)
treeaacbff05409a95bb70ba91ae486cbbd578633f21
parent10a23bf307e9b0a340f003aaaacbe36d80b04732 (diff)
Improve binary gems handling and get more compatible with Fedora1.193
-rw-r--r--NEWS3
-rw-r--r--build.macros.in22
-rw-r--r--configure.ac2
3 files changed, 15 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 1a14862..3a3e54c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.193 - 17 Dec 2013, by Pascal Terjan
+- Improve binary gems handling and get more compatible with Fedora
+
Version 1.192 - 15 Oct 2013, by Pascal Terjan
- Switch to new pythonegg dependencies
- Add -O flag to %make
diff --git a/build.macros.in b/build.macros.in
index baca002..1036db5 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -489,6 +489,7 @@ popd
#
%__ruby_module_name %{?oname}%{!?oname:%(echo %{name}|cut -d\- -f2-)}
+%gem_name %__ruby_module_name
%gem_setup \
%setup -q \
@@ -514,19 +515,18 @@ sed -i -e 's/`git ls-files`/`find -type f`/' \\\
--install-dir %{buildroot}%{ruby_gemdir} \\\
--bindir %{buildroot}%{_bindir} \
%{-d: \
- mkdir -p %{buildroot}%{ruby_vendorarchdir} \
- for f in $(find %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}/ext -name *.h); do \
- mv $f %{buildroot}%{ruby_vendorarchdir}/ \
- done \
+ (cd %{buildroot}%{gem_instdir}; \\\
+ for f in $(find -name *.h); do \\\
+ mkdir -p %{buildroot}%{gem_extdir_mri}/$(dirname $f); \\\
+ mv $f %{buildroot}%{gem_extdir_mri}/$f; \\\
+ done ) \
} \
- (cd %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version}; \\\
- for f in $(find -name '*.so'); do \\\
- dest=${f##./ext/}; \\\
- dest=${dest##./lib/}; \\\
- mkdir -p %{buildroot}%{ruby_sitearchdir}/$(dirname $dest); \\\
- mv $f %{buildroot}%{ruby_sitearchdir}/$dest; done ) \
+ (cd %{buildroot}%{gem_instdir}; \\\
+ for f in $(find -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} \
- find %{buildroot}%{ruby_gemdir}/gems/%{__ruby_module_name}-%{version} -maxdepth 1 -type f -delete \
+ find %{buildroot}%{gem_instdir} -maxdepth 1 -type f -delete \
#------------------------------------------------------------------------------
# Systemd and general service related macros
diff --git a/configure.ac b/configure.ac
index b15be6c..c7d1e3c 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.192, pterjan@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.193, pterjan@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR