[rubygem-narray/el5: 2/2] rebuilt for libruby.so.2.0() so-name bump

Björn Esser besser82 at fedoraproject.org
Sat May 17 10:05:06 UTC 2014


commit b132dc66e4d9622ccea0f0bfff1fe050773c2243
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Sat May 17 11:36:09 2014 +0200

    rebuilt for libruby.so.2.0() so-name bump

 rubygem-narray.spec |   69 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 38 insertions(+), 31 deletions(-)
---
diff --git a/rubygem-narray.spec b/rubygem-narray.spec
index 7da68cb..3908d68 100644
--- a/rubygem-narray.spec
+++ b/rubygem-narray.spec
@@ -1,5 +1,3 @@
-%global gem_name narray
-
 # For compatibility with RHEL <= 6
 %{!?ruby_vendorlibdir:	%global ruby_vendorlibdir	%(ruby -rrbconfig -W0 -e "puts Config::CONFIG['sitelibdir']")}
 %{!?ruby_vendorarchdir:	%global ruby_vendorarchdir	%(ruby -rrbconfig -W0 -e "puts Config::CONFIG['sitearchdir']")}
@@ -11,6 +9,8 @@
 %{!?gem_docdir:		%global gem_docdir		%{gem_dir}/doc/%{gem_name}-%{version}}
 %{!?gem_extdir_mri:	%global gem_extdir_mri		%{ruby_vendorarchdir}}
 
+%global gem_name narray
+
 Name:			rubygem-%{gem_name}
 Version:		0.6.0.8
 Release:		11%{?dist}
@@ -23,25 +23,22 @@ Source0:		http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 
 %{?el5:BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
 BuildRequires:		ruby-devel
+BuildRequires:		rubygems%{!?el5:-devel}
 
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildRequires:		rubygems-devel
-
 Requires:		ruby(release)
-%else
-BuildRequires:		rubygems%{!?el5:-devel}
-
-%{?rhel:Requires:	ruby(abi)		=  1.8}
-%{!?rhel:Requires:	ruby(abi)		=  1.9.1}
-%endif
+%else #0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%{?rhel:Requires:	ruby(abi)			== 1.8}
+%{!?rhel:Requires:	ruby(abi)			== 1.9.1}
+%endif #0%{?fedora} >= 19 || 0%{?rhel} >= 7
 Requires:		rubygems
 
 %if 0%{?fedora} && 0%{?fedora} <= 22
 Obsoletes:		%{name}-common			<  %{version}-%{release}
-%endif
+%endif #0%{?fedora} && 0%{?fedora} <= 22
 
-Provides:		rubygem(%{gem_name})		=  %{version}
-Provides:		rubygem(%{gem_name})%{?_isa}	=  %{version}
+Provides:		rubygem(%{gem_name})		== %{version}
+Provides:		rubygem(%{gem_name})%{?_isa}	== %{version}
 
 %description
 NArray is a Numerical N-dimensional Array class.  Supported element types are
@@ -55,18 +52,18 @@ NumPy, but NArray has vector and matrix sub-classes.
 Summary:		Development files and developer's docs for %{name}
 %{?el5:Group:		Development/Libraries}
 
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if (0%{?fedora} && 0%{?fedora} <= 20) || 0%{?rhel} == 7
 BuildArch:		noarch
-Requires:		%{name}				=  %{version}-%{release}
-%else
-Requires:		%{name}%{?_isa}			=  %{version}-%{release}
-%endif
+Requires:		%{name}				== %{version}-%{release}
+%else #(0%{?fedora} && 0%{?fedora} <= 20) || 0%{?rhel} == 7
+Requires:		%{name}%{?_isa}			== %{version}-%{release}
+%endif #(0%{?fedora} && 0%{?fedora} <= 20) || 0%{?rhel} == 7
 
 %if 0%{?fedora} && 0%{?fedora} <= 22
 Obsoletes:		%{name}-devel			<  %{version}-%{release}
 Obsoletes:		%{name}-common-devel		<  %{version}-%{release}
 Obsoletes:		%{name}-doc			<  %{version}-%{release}
-%endif
+%endif #0%{?fedora} && 0%{?fedora} <= 22
 
 %description devel
 This package contains the development files and the developer's documentation
@@ -77,13 +74,13 @@ for %{name}.
 %setup -qcT
 %if 0%{?fedora} || 0%{?rhel} >= 6
 %gem_install -n %{SOURCE0}
-%else
+%else #0%{?fedora} || 0%{?rhel} >= 6
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 mkdir -p .%{gem_dir}
 gem install									\
 	-V --local --install-dir .%{gem_dir} --bindir .%{_bindir}		\
 	--force --backtrace %{SOURCE0}
-%endif
+%endif #0%{?fedora} || 0%{?rhel} >= 6
 
 
 %build
@@ -92,19 +89,23 @@ gem install									\
 
 %install
 %{?el5:rm -rf %{buildroot}}
-mkdir -p %{buildroot}%{gem_dir}							\
-	%{buildroot}%{gem_extdir_mri}
+mkdir -p %{buildroot}%{_prefix}
 
 # Install the gem to final location
-cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}
+cp -a ./%{_prefix}/* %{buildroot}%{_prefix}
+%if (0%{?fedora} && 0%{?fedora} <= 20) || (0%{?rhel} && 0%{?rhel} <= 7)
+mkdir -p %{buildroot}%{gem_extdir_mri}
 mv -f %{buildroot}%{gem_instdir}/%{gem_name}.so					\
 	%{buildroot}%{gem_extdir_mri}
+%endif #(0%{?fedora} && 0%{?fedora} <= 20) || (0%{?rhel} && 0%{?rhel} <= 7)
 
 # Clean-up
 pushd %{buildroot}
 find .%{gem_instdir} -depth -type f -name '*.so' -print0 | xargs -0 rm -rf
 find . -depth -type f -name '.*' -print0 | xargs -0 rm -rf
+find . -depth -type f -name '*.log' -print0 | xargs -0 rm -rf
 find . -depth -type f -name '*.o' -print0 | xargs -0 rm -rf
+find . -depth -type f -name '*.out' -print0 | xargs -0 rm -rf
 find . -depth -size 0 -type f -print0 | xargs -0 rm -rf
 rm -rf .%{gem_cache} .%{gem_instdir}/src .%{gem_instdir}/%{gem_name}.gemspec
 popd
@@ -112,9 +113,8 @@ popd
 # On <= el6 there needs to be a symlink for %%{gem_name}_ext.rb
 # in %%{ruby_vendorarchdir}.  Otherwise the so-plugin can't be loaded.
 %if 0%{?rhel} && 0%{?rhel} <= 6
-ln -fs	%{gem_instdir}/%{gem_name}_ext.rb					\
-	%{buildroot}%{gem_extdir_mri}
-%endif
+ln -fs	%{gem_instdir}/%{gem_name}_ext.rb %{buildroot}%{gem_extdir_mri}
+%endif #0%{?rhel} && 0%{?rhel} <= 6
 
 
 %{?el5:%clean}
@@ -127,21 +127,28 @@ ln -fs	%{gem_instdir}/%{gem_name}_ext.rb					\
 %dir %{gem_instdir}
 %exclude %{gem_instdir}/MANIFEST
 %exclude %{gem_instdir}/SPEC.*
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%exclude %{gem_extdir_mri}/*.h
+%else #0%{?fedora} >= 21 || 0%{?rhel} >= 8
 %exclude %{gem_instdir}/*.h
+%{gem_instdir}/*.rb
+%endif #0%{?fedora} >= 21 || 0%{?rhel} >= 8
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %{gem_extdir_mri}
-%else
+%else #0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %{gem_extdir_mri}/%{gem_name}*
-%endif
-%{gem_instdir}/*.rb
+%endif #0%{?fedora} >= 19 || 0%{?rhel} >= 7
 %{gem_spec}
 
 %files devel
 %doc %{gem_docdir}
 %doc %{gem_instdir}/MANIFEST
 %doc %{gem_instdir}/SPEC.*
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%{gem_extdir_mri}/*.h
+%else #0%{?fedora} >= 21 || 0%{?rhel} >= 8
 %{gem_instdir}/*.h
-
+%endif #0%{?fedora} >= 21 || 0%{?rhel} >= 8
 
 %changelog
 * Thu May 01 2014 Björn Esser <bjoern.esser at gmail.com> - 0.6.0.8-11


More information about the scm-commits mailing list