diff --git a/builder-3.2.3.gem b/builder-3.2.3.gem deleted file mode 100644 index 3500c80..0000000 Binary files a/builder-3.2.3.gem and /dev/null differ diff --git a/builder-3.2.4.gem b/builder-3.2.4.gem new file mode 100644 index 0000000..b12407c Binary files /dev/null and b/builder-3.2.4.gem differ diff --git a/rubygem-builder-3.2.4-Fix-Ruby-3-compatibility.patch b/rubygem-builder-3.2.4-Fix-Ruby-3-compatibility.patch new file mode 100644 index 0000000..4ecded3 --- /dev/null +++ b/rubygem-builder-3.2.4-Fix-Ruby-3-compatibility.patch @@ -0,0 +1,13 @@ +diff --git a/lib/blankslate.rb b/lib/blankslate.rb +index 7ea1864..b974f40 100644 +--- a/lib/blankslate.rb ++++ b/lib/blankslate.rb +@@ -129,7 +129,7 @@ class Module + alias blankslate_original_append_features append_features + def append_features(mod) + result = blankslate_original_append_features(mod) +- return result if mod != Object ++ return result if (mod != Object && mod != Kernel) + instance_methods.each do |name| + BlankSlate.hide(name) + end diff --git a/rubygem-builder.spec b/rubygem-builder.spec index ce9669e..34fd72a 100644 --- a/rubygem-builder.spec +++ b/rubygem-builder.spec @@ -1,13 +1,14 @@ %global gem_name builder Name: rubygem-%{gem_name} -Version: 3.2.3 +Version: 3.2.4 Release: 1 Summary: Builders for MarkUp License: MIT URL: http://onestepback.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(release) rubygems-devel ruby rubygem(minitest) +Patch1: rubygem-builder-3.2.4-Fix-Ruby-3-compatibility.patch BuildArch: noarch %description Builder provides a number of builder objects that make creating structured @@ -23,19 +24,23 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +%setup -q -n %{gem_name}-%{version} + +%patch1 -p1 %build +gem build ../%{gem_name}-%{version}.gemspec + +%gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -# Fix anything executable that does not have a shebang. -for file in `find %{buildroot}/%{gem_instdir} -name "*.rb"`; do - [ ! -z "`head -n 1 $file | grep \"^#!\"`" ] && chmod +x $file -done +pushd %{buildroot}%{gem_instdir} + find -type f -name '*.rb' -print | xargs sed -i '/#!\/usr\/bin\/env/d' +popd + chmod -x %{buildroot}%{gem_instdir}/doc/releases/builder-2.1.1.rdoc %check @@ -55,10 +60,15 @@ popd %doc %{gem_instdir}/CHANGES %doc %{gem_instdir}/README.md %{gem_instdir}/Rakefile +%{gem_instdir}/builder.blurb +%{gem_instdir}/builder.gemspec %doc %{gem_instdir}/doc %{gem_instdir}/rakelib %{gem_instdir}/test %changelog +* Thu Feb 10 2022 chenchen - 3.2.4-1 +- update to 3.2.4 + * Sat Jul 25 2020 wangxiao - 3.2.3-1 - package init