fix build fail

rubygem-rspec-core.spec

@@ -1,3 +1,4 @@
+%bcond_with bootstrap
 %global majorver        3.8.2
 %global rpmminorver     .%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global fullver %{majorver}%{?preminorver}
@@ -7,7 +8,7 @@
 Summary:        Rspec-2 runner and formatters
 Name:           rubygem-%{gem_name}
 Version:        %{majorver}
-Release:        1
+Release:        2
 License:        MIT
 URL:            http://github.com/rspec/rspec-mocks
 Source0:        http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
@@ -42,6 +43,7 @@ gem build %{gem_name}.gemspec
 mkdir -p %{buildroot}%{_prefix}
 cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
 rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts}
+%if %{with bootstrap}
 %if 0%{?need_bootstrap_set} < 1
 
 %check
@@ -93,8 +95,10 @@ sed -i.warn lib/rspec/core/configuration_options.rb \
 ruby -rrubygems -Ilib/ -S exe/rspec || \
         ruby -rrubygems -Ilib/ -S exe/rspec --tag ~broken
 %endif
+%endif
 mv lib/rspec/core/configuration_options.rb{.warn,}
 
+
 %files
 %dir    %{gem_instdir}
 %license        %{gem_instdir}/LICENSE.md
@@ -110,5 +114,8 @@ mv lib/rspec/core/configuration_options.rb{.warn,}
 %{gem_docdir}
 
 %changelog
+* Mon Sep 7 2020 liyanan <liyanan32@huawei.com> - 3.8.2-2
+- fix build fail
+
 * Wed Aug 19 2020 huangyangke <huangyangke@huawei.com> - 3.8.2-1
 - package init

spec_prep_plus.sh

@@ -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