From d886153d9a08c46b8c08af55653faf8f89c677b1 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Mon, 21 Dec 2009 23:20:08 +0100 Subject: Remove %{?_smp_mflags} --- ruby-1.8.6.spec | 2 +- ruby-1.9.1.spec | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ruby-1.8.6.spec b/ruby-1.8.6.spec index b883dc3..aa19878 100644 --- a/ruby-1.8.6.spec +++ b/ruby-1.8.6.spec @@ -244,7 +244,7 @@ export CFLAGS --disable-rpath \ --with-ruby-version=full -make %{?_smp_mflags} COPY="cp -p" +make COPY="cp -p" %install rm -rf %{buildroot} diff --git a/ruby-1.9.1.spec b/ruby-1.9.1.spec index c2aec0b..46b3534 100644 --- a/ruby-1.9.1.spec +++ b/ruby-1.9.1.spec @@ -15,10 +15,10 @@ %{!?ruby_vendorlib: %global ruby_vendorlib %{_datadir}/ruby/} %{!?ruby_vendorarch: %global ruby_vendorarch %{_libdir}/ruby/} -%{!?ruby_sitelib_191: %global ruby_sitelib_186 %{_prefix}/local/share/ruby/1.9.1/} -%{!?ruby_sitearch_191: %global ruby_sitearch_186 %{_prefix}/local/%{_lib}/ruby/1.9.1/} -%{!?ruby_vendorlib_191: %global ruby_vendorlib_186 %{_datadir}/ruby/1.9.1/} -%{!?ruby_vendorarch_191: %global ruby_vendorarch_186 %{_libdir}/ruby/1.9.1/} +%{!?ruby_sitelib_191: %global ruby_sitelib_191 %{_prefix}/local/share/ruby/1.9.1/} +%{!?ruby_sitearch_191: %global ruby_sitearch_191 %{_prefix}/local/%{_lib}/ruby/1.9.1/} +%{!?ruby_vendorlib_191: %global ruby_vendorlib_191 %{_datadir}/ruby/1.9.1/} +%{!?ruby_vendorarch_191: %global ruby_vendorarch_191 %{_libdir}/ruby/1.9.1/} # Work on some of the defined variables to get the things we # want (need) @@ -217,7 +217,7 @@ export CFLAGS --disable-rpath \ --with-ruby-version=full -make %{?_smp_mflags} COPY="cp -p" +make COPY="cp -p" %install rm -rf %{buildroot} @@ -245,10 +245,9 @@ for script in `find %{buildroot}/%{ruby_sitelib} -type f -name "*.rb"`; do done if [ ! -d %{buildroot}/%{_includedir}/ruby%{?_compatsuffix}/ ]; then - # The headers are probably in the vendor arch dir - mkdir -p %{buildroot}/%{_includedir}/ruby%{?_compatsuffix}/ - find %{buildroot}/%{ruby_vendorarch} -mindepth 1 -maxdepth 1 -type f ! -name "*.so" -exec mv -v {} %{buildroot}/%{_includedir}/ruby%{?_compatsuffix}/. \; + mv %{buildroot}/%{_includedir}/ruby%{?_compatsuffix}-*/ %{buildroot}/%{_includedir}/ruby%{?_compatsuffix}/ fi + %clean rm -rf %{buildroot} -- cgit