Update to 2.5.2
(cherry picked from commit cb89670e9506910628807c270ae7c5b60ed8eeda)
This commit is contained in:
wk333
openeuler-sync-bot
parent
c87da62e7f
commit
fdd84770bf
BIN
nio4r-2.3.1.gem
BIN
nio4r-2.3.1.gem
Binary file not shown.
BIN
nio4r-2.5.2.gem
Normal file
BIN
nio4r-2.5.2.gem
Normal file
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
%global gem_name nio4r
|
||||
%global libev_version 4.24
|
||||
%global libev_version 4.27
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 2.3.1
|
||||
Version: 2.5.2
|
||||
Release: 1
|
||||
Summary: New IO for Ruby
|
||||
License: MIT and (BSD or GPLv2+)
|
||||
@ -23,7 +23,7 @@ Obsoletes: %{name}-doc < %{version}-%{release}
|
||||
Documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{gem_name}-%{version}
|
||||
%autosetup -n %{gem_name}-%{version} -p1
|
||||
|
||||
%build
|
||||
gem build ../%{gem_name}-%{version}.gemspec
|
||||
@ -45,16 +45,6 @@ EV_VERSION_MINOR=$(grep EV_VERSION_MINOR ext/libev/ev.h | cut -d ' ' -f3)
|
||||
[ "${EV_VERSION_MAJOR}.${EV_VERSION_MINOR}" = '%{libev_version}' ]
|
||||
sed -i '/require "coveralls"/ s/^/#/' spec/spec_helper.rb
|
||||
sed -i '/Coveralls.wear!/ s/^/#/' spec/spec_helper.rb
|
||||
sed -i '/require "rspec\/retry"/ s/^/#/' spec/spec_helper.rb
|
||||
sed -i '/config.verbose_retry/ s/^/#/' spec/spec_helper.rb
|
||||
sed -i '/config.display_try_failure_messages/ s/^/#/' spec/spec_helper.rb
|
||||
sed -i 's/, retry: [0-9]\+//' spec/nio/selectables/tcp_socket_spec.rb
|
||||
sed -i 's/, retry: [0-9]\+//' spec/support/selectable_examples.rb
|
||||
sed -i '/TIMEOUT_PRECISION/ s/0.1/0.5/' spec/nio/selector_spec.rb
|
||||
sed -i '/^ it "wakes up if signaled to from another thread" do$/,/^ end$/ s/0.1/0.5/' \
|
||||
spec/nio/selector_spec.rb
|
||||
sed -i '/"selects readable when the other end closes"/a\
|
||||
skip' spec/support/selectable_examples.rb
|
||||
rspec -I$(dirs +1)%{gem_extdir_mri} spec
|
||||
popd
|
||||
|
||||
@ -62,7 +52,9 @@ popd
|
||||
%dir %{gem_instdir}
|
||||
%{gem_extdir_mri}
|
||||
%exclude %{gem_instdir}/.*
|
||||
%license %{gem_instdir}/LICENSE.txt
|
||||
# License file was removed in favor of README.md
|
||||
# https://github.com/socketry/nio4r/issues/228
|
||||
%license %{gem_instdir}/README.md
|
||||
%exclude %{gem_instdir}/appveyor.yml
|
||||
%{gem_libdir}
|
||||
%exclude %{gem_cache}
|
||||
@ -71,10 +63,9 @@ popd
|
||||
%files help
|
||||
%doc %{gem_docdir}
|
||||
%{gem_instdir}/Gemfile
|
||||
%doc %{gem_instdir}/README.md
|
||||
%doc %{gem_instdir}/CHANGES.md
|
||||
%{gem_instdir}/logo.png
|
||||
%{gem_instdir}/tasks
|
||||
%{gem_instdir}/rakelib
|
||||
%{gem_instdir}/Guardfile
|
||||
%{gem_instdir}/Rakefile
|
||||
%{gem_instdir}/examples
|
||||
@ -82,5 +73,8 @@ popd
|
||||
%{gem_instdir}/spec
|
||||
|
||||
%changelog
|
||||
* Tue Aug 23 2022 wangkai <wangkai385@h-partners.com> - 2.5.2-1
|
||||
- Update to 2.5.2
|
||||
|
||||
* Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 2.3.1-1
|
||||
- package init
|
||||
|
||||
@ -1,164 +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- package init"
|
||||
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!!!!!!!'
|
||||
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