Commit fdd729c5 authored by mh's avatar mh
Browse files

better handling of new locations

parent 6b534252
Pipeline #9079 failed with stages
in 56 seconds
...@@ -36,14 +36,20 @@ Documentation for %{name}. ...@@ -36,14 +36,20 @@ Documentation for %{name}.
%install %install
mkdir -p %{buildroot}%{gem_dir} mkdir -p %{buildroot}%{gem_dir}
mkdir -p %{buildroot}%{gem_extdir_mri} mkdir -p %{buildroot}%{gem_extdir_mri}
cp -a .%{gem_dir}/* \
%{buildroot}%{gem_dir}/ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
if [ -d .%{gem_extdir_mri}/%{gem_name} ]; then if [ -d .%{gem_extdir_mri}/%{gem_name} ]; then
mv .%{gem_extdir_mri}/%{gem_name}/*.so %{buildroot}%{gem_extdir_mri}/%{gem_name} cp -a .%{gem_extdir_mri}/{gem.build_complete,%{gem_name}} %{buildroot}%{gem_extdir_mri}
mkdir -p %{buildroot}%{ruby_libdir}
mkdir -p %{buildroot}%{ruby_libarchdir}
ln -s %{gem_libdir}/%{gem_name}.rb %{buildroot}%{ruby_libdir}/%{gem_name}.rb
ln -s %{gem_libdir}/%{gem_name} %{buildroot}%{ruby_libdir}/%{gem_name}
ln -s %{gem_extdir_mri}/%{gem_name}/ %{buildroot}%{ruby_libarchdir}/%{gem_name}
else else
mkdir -p %{buildroot}%{gem_extdir_mri}/lib/%{gem_name} mkdir -p %{buildroot}%{gem_extdir_mri}/lib/%{gem_name}
mv %{buildroot}%{gem_libdir}/%{gem_name}/*.so %{buildroot}%{gem_extdir_mri}/lib/%{gem_name} cp -a %{buildroot}%{gem_libdir}/%{gem_name}/*.so %{buildroot}%{gem_extdir_mri}/lib/%{gem_name}
fi fi
# Remove the binary extension sources and build leftovers. # Remove the binary extension sources and build leftovers.
...@@ -57,7 +63,7 @@ for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*. ...@@ -57,7 +63,7 @@ for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*.
&& chmod -v 755 $file && chmod -v 755 $file
done done
find %{buildroot}%{gem_instdir} -name \*.rb -print0 | xargs --null chmod 0644
%check %check
#pushd .%{gem_instdir} #pushd .%{gem_instdir}
...@@ -69,6 +75,8 @@ done ...@@ -69,6 +75,8 @@ done
%dir %{gem_instdir} %dir %{gem_instdir}
%{gem_libdir} %{gem_libdir}
%{gem_extdir_mri} %{gem_extdir_mri}
%{ruby_libdir}/%{gem_name}*
%{ruby_libarchdir}/%{gem_name}*
%exclude %{gem_cache} %exclude %{gem_cache}
%{gem_spec} %{gem_spec}
%{gem_instdir}/%{gem_name}.gemspec %{gem_instdir}/%{gem_name}.gemspec
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment