From 25b3903487f4d03b20c9c115676c931a218db3b8 Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Sat, 5 Sep 2020 18:22:42 +0800
Subject: [PATCH 1/2] fix build fail

---
 rubygem-curb.spec  |   8 ++-
 rubygem-curb.spec~ |  65 ++++++++++++++++++
 spec_prep_plus.sh  | 168 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 240 insertions(+), 1 deletion(-)
 create mode 100644 rubygem-curb.spec~
 create mode 100755 spec_prep_plus.sh

diff --git a/rubygem-curb.spec b/rubygem-curb.spec
index 954c0e4..dccafd3 100644
--- a/rubygem-curb.spec
+++ b/rubygem-curb.spec
@@ -1,7 +1,8 @@
+%bcond_with bootstrap
 %global gem_name curb
 Name:                rubygem-%{gem_name}
 Version:             0.9.7
-Release:             1
+Release:             2
 Summary:             Ruby libcurl bindings
 License:             Ruby
 URL:                 https://github.com/taf2/curb
@@ -39,10 +40,12 @@ mkdir -p %{buildroot}%{gem_extdir_mri}
 cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 rm -rf %{buildroot}%{gem_instdir}/ext/
 
+%if %{with bootstrap}
 %check
 pushd .%{gem_instdir}
 ruby -e 'Dir.glob "./tests/tc_*.rb", &method(:require)'
 popd
+%endif
 
 %files
 %dir %{gem_instdir}
@@ -60,5 +63,8 @@ popd
 %{gem_instdir}/tests
 
 %changelog
+* Sat Sep 5 2020 liyanan <liyanan32@huawei.com> - 0.9.7-2
+- fix build fail
+
 * Fri Jul 24 2020 wutao <wutao61@huawei.com> - 0.9.7-1
 - package init
diff --git a/rubygem-curb.spec~ b/rubygem-curb.spec~
new file mode 100644
index 0000000..c81edcf
--- /dev/null
+++ b/rubygem-curb.spec~
@@ -0,0 +1,65 @@
+%bcond_with bootstrap
+%global gem_name curb
+Name:                rubygem-%{gem_name}
+Version:             0.9.7
+Release:             1
+Summary:             Ruby libcurl bindings
+License:             Ruby
+URL:                 https://github.com/taf2/curb
+Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch0:              curb-disable-network-lookup-test.patch
+Patch1:              rubygem-curb-0.9.7-libcurl-762-seems-to-have-changed-file-slightly.patch
+BuildRequires:       ruby(release) rubygems-devel ruby-devel rubygem(test-unit) libcurl-devel gcc
+%description
+Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
+libcurl(3), a fully-featured client-side URL transfer library. cURL and
+libcurl live at http://curl.haxx.se/.
+
+%package doc
+Summary:             Documentation for %{name}
+Requires:            %{name} = %{version}-%{release}
+BuildArch:           noarch
+%description doc
+Documentation for %{name}.
+
+%prep
+%setup -q -n %{gem_name}-%{version}
+gem unpack %{SOURCE0}
+%patch0 -p1
+%patch1 -p1
+
+%build
+gem build ../%{gem_name}-%{version}.gemspec
+%gem_install
+
+%install
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
+rm -rf %{buildroot}%{gem_instdir}/ext/
+
+%check
+pushd .%{gem_instdir}
+ruby -e 'Dir.glob "./tests/tc_*.rb", &method(:require)'
+popd
+
+%files
+%dir %{gem_instdir}
+%{gem_extdir_mri}
+%license %{gem_instdir}/LICENSE
+%{gem_libdir}
+%exclude %{gem_cache}
+%{gem_spec}
+
+%files doc
+%doc %{gem_docdir}
+%doc %{gem_instdir}/README.markdown
+%{gem_instdir}/Rakefile
+%{gem_instdir}/doc.rb
+%{gem_instdir}/tests
+
+%changelog
+* Fri Jul 24 2020 wutao <wutao61@huawei.com> - 0.9.7-1
+- package init
diff --git a/spec_prep_plus.sh b/spec_prep_plus.sh
new file mode 100755
index 0000000..473cec6
--- /dev/null
+++ b/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
+
+
+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

From 5bcc2b0ad8bdd7a781a87be43d47a8e862a2178f Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Sat, 5 Sep 2020 18:23:03 +0800
Subject: [PATCH 2/2] fix build fail

---
 rubygem-curb.spec~ |  65 ------------------
 spec_prep_plus.sh  | 168 ---------------------------------------------
 2 files changed, 233 deletions(-)
 delete mode 100644 rubygem-curb.spec~
 delete mode 100755 spec_prep_plus.sh

diff --git a/rubygem-curb.spec~ b/rubygem-curb.spec~
deleted file mode 100644
index c81edcf..0000000
--- a/rubygem-curb.spec~
+++ /dev/null
@@ -1,65 +0,0 @@
-%bcond_with bootstrap
-%global gem_name curb
-Name:                rubygem-%{gem_name}
-Version:             0.9.7
-Release:             1
-Summary:             Ruby libcurl bindings
-License:             Ruby
-URL:                 https://github.com/taf2/curb
-Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
-Patch0:              curb-disable-network-lookup-test.patch
-Patch1:              rubygem-curb-0.9.7-libcurl-762-seems-to-have-changed-file-slightly.patch
-BuildRequires:       ruby(release) rubygems-devel ruby-devel rubygem(test-unit) libcurl-devel gcc
-%description
-Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
-libcurl(3), a fully-featured client-side URL transfer library. cURL and
-libcurl live at http://curl.haxx.se/.
-
-%package doc
-Summary:             Documentation for %{name}
-Requires:            %{name} = %{version}-%{release}
-BuildArch:           noarch
-%description doc
-Documentation for %{name}.
-
-%prep
-%setup -q -n %{gem_name}-%{version}
-gem unpack %{SOURCE0}
-%patch0 -p1
-%patch1 -p1
-
-%build
-gem build ../%{gem_name}-%{version}.gemspec
-%gem_install
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
-mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
-rm -rf %{buildroot}%{gem_instdir}/ext/
-
-%check
-pushd .%{gem_instdir}
-ruby -e 'Dir.glob "./tests/tc_*.rb", &method(:require)'
-popd
-
-%files
-%dir %{gem_instdir}
-%{gem_extdir_mri}
-%license %{gem_instdir}/LICENSE
-%{gem_libdir}
-%exclude %{gem_cache}
-%{gem_spec}
-
-%files doc
-%doc %{gem_docdir}
-%doc %{gem_instdir}/README.markdown
-%{gem_instdir}/Rakefile
-%{gem_instdir}/doc.rb
-%{gem_instdir}/tests
-
-%changelog
-* Fri Jul 24 2020 wutao <wutao61@huawei.com> - 0.9.7-1
-- package init
diff --git a/spec_prep_plus.sh b/spec_prep_plus.sh
deleted file mode 100755
index 473cec6..0000000
--- a/spec_prep_plus.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-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
-
-
-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