fix build fail
This commit is contained in:
lyn1001
parent
3f8b0d0cb2
commit
d3a9368550
@ -1,3 +1,4 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
%global majorver 2.14.6
|
%global majorver 2.14.6
|
||||||
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
|
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
|
||||||
%global fullver %{majorver}%{?preminorver}
|
%global fullver %{majorver}%{?preminorver}
|
||||||
@ -7,7 +8,7 @@
|
|||||||
Summary: Rspec 2 doubles (mocks and stubs)
|
Summary: Rspec 2 doubles (mocks and stubs)
|
||||||
Name: rubygem-%{rpmgem_name}
|
Name: rubygem-%{rpmgem_name}
|
||||||
Version: %{majorver}
|
Version: %{majorver}
|
||||||
Release: 1
|
Release: 2
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://github.com/rspec/rspec-mocks
|
URL: http://github.com/rspec/rspec-mocks
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
|
||||||
@ -43,8 +44,8 @@ mkdir -p %{buildroot}%{gem_dir}
|
|||||||
cp -a .%{gem_dir}/* \
|
cp -a .%{gem_dir}/* \
|
||||||
%{buildroot}%{gem_dir}/
|
%{buildroot}%{gem_dir}/
|
||||||
rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.travis.yml,.yardopts}
|
rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.travis.yml,.yardopts}
|
||||||
|
%if %{with bootstrap}
|
||||||
%if 0%{?need_bootstrap_set} < 1
|
%if 0%{?need_bootstrap_set} < 1
|
||||||
|
|
||||||
%check
|
%check
|
||||||
pushd .%{gem_instdir}
|
pushd .%{gem_instdir}
|
||||||
sed -i.yaml spec/rspec/mocks/serialization_spec.rb \
|
sed -i.yaml spec/rspec/mocks/serialization_spec.rb \
|
||||||
@ -53,6 +54,7 @@ sed -i.toplevel spec/rspec/mocks/mutate_const_spec.rb \
|
|||||||
-e '\@expect.TestClass::Hash.@d'
|
-e '\@expect.TestClass::Hash.@d'
|
||||||
ruby -rrubygems -Ilib/ -S rspec2 spec/
|
ruby -rrubygems -Ilib/ -S rspec2 spec/
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%dir %{gem_instdir}
|
%dir %{gem_instdir}
|
||||||
@ -68,5 +70,8 @@ ruby -rrubygems -Ilib/ -S rspec2 spec/
|
|||||||
%exclude %{gem_instdir}/spec/
|
%exclude %{gem_instdir}/spec/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 7 2020 liyanan <liyanan32@huawei.com> - 2.14.6-2
|
||||||
|
- fix build fail
|
||||||
|
|
||||||
* Wed Aug 19 2020 huangyangke <huangyangke@huawei.com> - %{majorver}-1
|
* Wed Aug 19 2020 huangyangke <huangyangke@huawei.com> - %{majorver}-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
74
rubygem-rspec2-mocks.spec~
Normal file
74
rubygem-rspec2-mocks.spec~
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
%global majorver 2.14.6
|
||||||
|
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
|
||||||
|
%global fullver %{majorver}%{?preminorver}
|
||||||
|
%global gem_name rspec-mocks
|
||||||
|
%global rpmgem_name rspec2-mocks
|
||||||
|
%global need_bootstrap_set 0
|
||||||
|
Summary: Rspec 2 doubles (mocks and stubs)
|
||||||
|
Name: rubygem-%{rpmgem_name}
|
||||||
|
Version: %{majorver}
|
||||||
|
Release: 1
|
||||||
|
License: MIT
|
||||||
|
URL: http://github.com/rspec/rspec-mocks
|
||||||
|
Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem
|
||||||
|
BuildRequires: ruby(release) rubygems-devel
|
||||||
|
%if 0%{?need_bootstrap_set} < 1
|
||||||
|
BuildRequires: rubygem(rspec2)
|
||||||
|
%endif
|
||||||
|
Provides: rubygem(%{rpmgem_name}) = %{version}-%{release}
|
||||||
|
Obsoletes: rubygem-rspec-mocks < 2.14.6-1
|
||||||
|
BuildArch: noarch
|
||||||
|
%description
|
||||||
|
rspec-mocks provides a test-double framework for Rspec including support
|
||||||
|
for method stubs, fakes, and message expectations.
|
||||||
|
|
||||||
|
%package doc
|
||||||
|
Summary: Documentation for %{name}
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Obsoletes: rubygem-rspec-mocks-doc < %{version}-{release}
|
||||||
|
%description doc
|
||||||
|
This package contains documentation for %{name}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
gem unpack %{SOURCE0}
|
||||||
|
%setup -q -D -T -n %{gem_name}-%{version}
|
||||||
|
gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
||||||
|
|
||||||
|
%build
|
||||||
|
gem build %{gem_name}.gemspec
|
||||||
|
%gem_install
|
||||||
|
|
||||||
|
%install
|
||||||
|
mkdir -p %{buildroot}%{gem_dir}
|
||||||
|
cp -a .%{gem_dir}/* \
|
||||||
|
%{buildroot}%{gem_dir}/
|
||||||
|
rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.travis.yml,.yardopts}
|
||||||
|
%if 0%{?need_bootstrap_set} < 1
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
%check
|
||||||
|
pushd .%{gem_instdir}
|
||||||
|
sed -i.yaml spec/rspec/mocks/serialization_spec.rb \
|
||||||
|
-e '\@::YAML::ENGINE.yamler@d'
|
||||||
|
sed -i.toplevel spec/rspec/mocks/mutate_const_spec.rb \
|
||||||
|
-e '\@expect.TestClass::Hash.@d'
|
||||||
|
ruby -rrubygems -Ilib/ -S rspec2 spec/
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files
|
||||||
|
%dir %{gem_instdir}
|
||||||
|
%license %{gem_instdir}/License.txt
|
||||||
|
%doc %{gem_instdir}/*.md
|
||||||
|
%{gem_instdir}/lib/
|
||||||
|
%exclude %{gem_cache}
|
||||||
|
%{gem_spec}
|
||||||
|
|
||||||
|
%files doc
|
||||||
|
%{gem_docdir}
|
||||||
|
%{gem_instdir}/features/
|
||||||
|
%exclude %{gem_instdir}/spec/
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Aug 19 2020 huangyangke <huangyangke@huawei.com> - %{majorver}-1
|
||||||
|
- package init
|
||||||
168
spec_prep_plus.sh
Executable file
168
spec_prep_plus.sh
Executable file
@ -0,0 +1,168 @@
|
|||||||
|
changelog_update(){
|
||||||
|
# changelog replace
|
||||||
|
sed -i '/^%changelog/,$d' $file
|
||||||
|
date=`date +"%a %b %_d %Y"`
|
||||||
|
name='liyanan'
|
||||||
|
email='liyanan32@huawei.com'
|
||||||
|
changelog="%changelog\n* $date $name <$email> - ${version}-$release\n- fix build fail"
|
||||||
|
echo -e $changelog >> $file #sed -n '/^%changelog/,$p' $file
|
||||||
|
echo "Hint: changelog updated"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
single_merge(){
|
||||||
|
awk -v key="$1" -v max_len=80 -F : \
|
||||||
|
'BEGIN {\
|
||||||
|
tmp="";\
|
||||||
|
} \
|
||||||
|
{\
|
||||||
|
if( key == $1 ){\
|
||||||
|
if( NF > 2){\
|
||||||
|
oofs=FS;FS="#";
|
||||||
|
bbb=sub(/[[:alnum:] ]+:/,"",$0);\
|
||||||
|
aaa=$bbb;
|
||||||
|
FS=oofs;
|
||||||
|
}\
|
||||||
|
else{\
|
||||||
|
$1=""; \
|
||||||
|
aaa=$0;\
|
||||||
|
}\
|
||||||
|
|
||||||
|
tmp1=tmp aaa
|
||||||
|
gsub(" +"," ",tmp1);\
|
||||||
|
#print FNR tmp1
|
||||||
|
if(length(tmp1) > max_len){\
|
||||||
|
gsub(" +"," ",tmp);\
|
||||||
|
printf "%-20s%s\n",key ":",tmp;\
|
||||||
|
tmp="";\
|
||||||
|
}\
|
||||||
|
tmp=tmp aaa;\
|
||||||
|
}\
|
||||||
|
else {\
|
||||||
|
if( length(tmp) != 0){\
|
||||||
|
gsub(" +"," ",tmp);\
|
||||||
|
printf "%-20s%s\n",key ":",tmp;\
|
||||||
|
tmp="";\
|
||||||
|
}\
|
||||||
|
print $0;\
|
||||||
|
}\
|
||||||
|
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
|
headers_merge(){
|
||||||
|
cat $file | single_merge "BuildRequires" | single_merge "Requires" > .$file
|
||||||
|
mv -f .$file $file
|
||||||
|
echo "Hint: Tags merged"
|
||||||
|
}
|
||||||
|
|
||||||
|
delete_comment(){
|
||||||
|
sed -i '/^#.*/d' $file
|
||||||
|
echo "Hint: commentline deleted"
|
||||||
|
}
|
||||||
|
delete_blank(){
|
||||||
|
sed -i 's/[[:blank:]]\{1,\}$//g' $file
|
||||||
|
echo "Hint: tail-blank deleted "
|
||||||
|
}
|
||||||
|
|
||||||
|
insert_enter(){
|
||||||
|
sed -i '/^$/d' $file
|
||||||
|
sed -i '/^%package.*/i\ ' $file
|
||||||
|
sed -i '/^%pre.*/i\ ' $file
|
||||||
|
sed -i '/^%post.*/i\ ' $file
|
||||||
|
sed -i '/^%build.*/i\ ' $file
|
||||||
|
sed -i '/^%install.*/i\ ' $file
|
||||||
|
sed -i '/^%check*/i\ ' $file
|
||||||
|
sed -i '/^%files.*/i\ ' $file
|
||||||
|
sed -i '/^%changelog.*/i\ ' $file
|
||||||
|
echo "Hint: insert newline before stages"
|
||||||
|
}
|
||||||
|
|
||||||
|
increase_release(){
|
||||||
|
# release +1
|
||||||
|
sed -i "/^Release.*$/s/${release_oo}/${release}/" $file
|
||||||
|
# delete Group Tags
|
||||||
|
sed -i '/^Group.*/d' $file
|
||||||
|
echo "Hint: release ++"
|
||||||
|
}
|
||||||
|
|
||||||
|
header_align() {
|
||||||
|
awk '{
|
||||||
|
if ($0 ~ /^[A-Z][[:alnum:]]*: / ) {
|
||||||
|
va="";
|
||||||
|
for(i=2;i<=NF;i++){ va=va" "$i};
|
||||||
|
printf("%-20s%s\n",$1,va);
|
||||||
|
}
|
||||||
|
else print $0;
|
||||||
|
}' $file > .$file
|
||||||
|
mv -f .$file $file
|
||||||
|
echo "Hint: header_align done"
|
||||||
|
}
|
||||||
|
|
||||||
|
#################### main
|
||||||
|
main(){
|
||||||
|
|
||||||
|
file_o=$1
|
||||||
|
file=${file_o}.cp
|
||||||
|
sed -i 's/\t/ /g' $1
|
||||||
|
#sed -i 's/%package\s\+javadoc$/%package help/g' $1
|
||||||
|
#sed -i '/%description\s\+javadoc$/i\Provides: %{name}-javadoc = %{version}-%{release}' $1
|
||||||
|
#sed -i '/%description\s\+javadoc$/i\Obsoletes: %{name}-javadoc < %{version}-%{release}' $1
|
||||||
|
#sed -i 's/%description\s\+javadoc$/%description help/g' $1
|
||||||
|
#sed -i 's/%files\s\+javadoc/%files help/g' $1
|
||||||
|
#sed -i 's/%package\s\+doc$/%package help/g' $1
|
||||||
|
#sed -i '/%description\s\+doc$/i\Provides: %{name}-doc = %{version}-%{release}' $1
|
||||||
|
#sed -i '/%description\s\+doc$/i\Obsoletes: %{name}-doc < %{version}-%{release}' $1
|
||||||
|
#sed -i 's/%description\s\+doc$/%description help/g' $1
|
||||||
|
#sed -i 's/%files\s\+doc$/%files help/g' $1
|
||||||
|
#echo 'mv javadoc or doc to help succeed!!!!!!!'
|
||||||
|
sed -i "1i %bcond_with bootstrap" $1
|
||||||
|
sed -i "/%check/i\%if %{with bootstrap}" $1
|
||||||
|
lyn=$(sed -n '/%files/=' $1 |sed -n "1"p)
|
||||||
|
sed -i '$lyn\i\%endif' $1
|
||||||
|
cp -f $file_o $file
|
||||||
|
|
||||||
|
# got verison release
|
||||||
|
version=`cat $file |grep '^Version' | awk '{print $2}'`
|
||||||
|
release_oo=`cat $file |grep '^Release' | awk '{print $2}'`
|
||||||
|
release_o=`echo $release_oo | sed 's/%{.*}//'`
|
||||||
|
release=$((release_o+1))
|
||||||
|
release=1
|
||||||
|
|
||||||
|
#marcos_expand keep this bug ...
|
||||||
|
delete_comment
|
||||||
|
changelog_update
|
||||||
|
increase_release
|
||||||
|
header_align
|
||||||
|
headers_merge
|
||||||
|
insert_enter
|
||||||
|
delete_blank
|
||||||
|
|
||||||
|
#let's play
|
||||||
|
#read -p "Hint: exec vimdiff $file $file_o ? enter [yes/no]: " ans
|
||||||
|
#vimdiff $file $file_o
|
||||||
|
#read -p "Hint: do mv -b -f $file $file_o ? enter [yes/no]: " ans
|
||||||
|
#if [[ $ans =~ [Yy]([Ee][Ss])? ]];then
|
||||||
|
mv -b -f $file $file_o
|
||||||
|
echo "Hint: $file_o updated"
|
||||||
|
#else
|
||||||
|
# rm -f $file
|
||||||
|
# echo "Hint: $file deleted. Not my bad :P "
|
||||||
|
#fi
|
||||||
|
echo "From SONG: Enjoy your spec working !"
|
||||||
|
}
|
||||||
|
|
||||||
|
banner(){
|
||||||
|
cat <<eof
|
||||||
|
+-+-+-+-+-+-+-+-+-+
|
||||||
|
|s|p|e|c|_|p|r|e|p|
|
||||||
|
+-+-+-+-+-+-+-+-+-+
|
||||||
|
eof
|
||||||
|
}
|
||||||
|
if [[ $# != 1 ]];then
|
||||||
|
banner
|
||||||
|
echo "USAGE: $(basename $0) SPECFILE"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
banner
|
||||||
|
main $1
|
||||||
Loading…
x
Reference in New Issue
Block a user