!9 [sync] PR-8: 【轻量级 PR】：fix spec changelog date error

From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git

rubygem-tzinfo.spec

@@ -1,13 +1,14 @@
-%bcond_with bootstrap
 %global gem_name tzinfo
 Name:                rubygem-%{gem_name}
-Version:             1.2.5
+Version:             2.0.4
-Release:             2
+Release:             1
 Summary:             Daylight savings aware timezone library
 License:             MIT
 URL:                 http://tzinfo.github.io
-Source0:             https://rubygems.org/gems/tzinfo-%{version}.gem
+Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
-BuildRequires:       ruby(release) rubygems-devel ruby rubygem(minitest) rubygem(thread_safe)
+Source1:             %{gem_name}-%{version}-tests.txz
+BuildRequires:       ruby(release) rubygems-devel ruby rubygem(minitest) rubygem(concurrent-ruby)
+BuildRequires:       rubygem(did_you_mean)
 BuildArch:           noarch
 %description
 TZInfo provides daylight savings aware transformations between times in
@@ -21,23 +22,26 @@ BuildArch:           noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%setup -q -n %{gem_name}-%{version} -b1
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
 %gem_install
 
-%if %{with bootstrap}
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
-%endif
 
 %check
 pushd .%{gem_instdir}
-ruby -Ilib -e "require './test/ts_all'"
+ln -s %{_builddir}/test .
-ruby -Ilib -e "require './test/ts_all_zoneinfo.rb'"
+
+# We don't want to use bundler
+sed -i "/raise 'Tests must be run with bundler/ s/^/#/" \
+  test/test_utils.rb
+
+RUBYOPT="-I.:lib:test" ruby -rtest/ts_all
 popd
 
 %files
@@ -52,13 +56,16 @@ popd
 %doc %{gem_docdir}
 %doc %{gem_instdir}/CHANGES.md
 %doc %{gem_instdir}/README.md
-%{gem_instdir}/Rakefile
-%{gem_instdir}/test
-%{gem_instdir}/%{gem_name}.gemspec
 
 %changelog
+* Wed Mar 2 2022 liqiuyu <liqiuyu@kylinos.cn> - 2.0.4-1
+- update to 2.0.4
+
+* Mon Feb 21 2022 liyanan <liyanan32@huawei.com> - 1.2.5-3
+- fix check failed for rubygem-timecop
+
 * Sat Sep 5 2020 liyanan <liyanan32@huawei.com> - 1.2.5-2
 - fix build fail
 
 * Sat Aug 8 2020 yanan li <liyanan032@huawei.com> - 1.2.5-1
-- Package init
+- Package init

rubygem-tzinfo.spec~

@@ -1,59 +0,0 @@
-%bcond_with bootstrap
-%global gem_name tzinfo
-Name:                rubygem-%{gem_name}
-Version:             1.2.5
-Release:             1
-Summary:             Daylight savings aware timezone library
-License:             MIT
-URL:                 http://tzinfo.github.io
-Source0:             https://rubygems.org/gems/tzinfo-%{version}.gem
-BuildRequires:       ruby(release) rubygems-devel ruby rubygem(minitest) rubygem(thread_safe)
-BuildArch:           noarch
-%description
-TZInfo provides daylight savings aware transformations between times in
-different time zones.
-
-%package doc
-Summary:             Documentation for %{name}
-Requires:            %{name} = %{version}-%{release}
-BuildArch:           noarch
-%description doc
-Documentation for %{name}.
-
-%prep
-%setup -q -n %{gem_name}-%{version}
-
-%build
-gem build ../%{gem_name}-%{version}.gemspec
-%gem_install
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
-
-%check
-pushd .%{gem_instdir}
-ruby -Ilib -e "require './test/ts_all'"
-ruby -Ilib -e "require './test/ts_all_zoneinfo.rb'"
-popd
-
-%files
-%dir %{gem_instdir}
-%exclude %{gem_instdir}/.yardopts
-%license %{gem_instdir}/LICENSE
-%{gem_libdir}
-%exclude %{gem_cache}
-%{gem_spec}
-
-%files doc
-%doc %{gem_docdir}
-%doc %{gem_instdir}/CHANGES.md
-%doc %{gem_instdir}/README.md
-%{gem_instdir}/Rakefile
-%{gem_instdir}/test
-%{gem_instdir}/%{gem_name}.gemspec
-
-%changelog
-* Sat Aug 8 2020 yanan li <liyanan032@huawei.com> - 1.2.5-1
-- Package init

spec_prep_plus.sh

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