From 56894ef4dcc29dfdb937c498d9804143fba1581b Mon Sep 17 00:00:00 2001 From: wubijie Date: Fri, 11 Aug 2023 10:49:54 +0800 Subject: [PATCH] Use %gem_extdir_mri instead of ext for %check due to ruby3.2 change (cherry picked from commit 662b6936e5e12b5fe334211f8e85c04836fc9b0a) --- rubygem-rdiscount.spec | 68 +++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/rubygem-rdiscount.spec b/rubygem-rdiscount.spec index 9a01182..f7713c9 100644 --- a/rubygem-rdiscount.spec +++ b/rubygem-rdiscount.spec @@ -1,7 +1,7 @@ %global gem_name rdiscount Name: rubygem-rdiscount Version: 2.2.0.2 -Release: 1 +Release: 2 Summary: Converts documents in Markdown syntax to HTML License: ASL 1.1 URL: http://github.com/rtomayko/rdiscount @@ -27,69 +27,77 @@ This package contains documentation for rubygem-rdiscount. %prep gem unpack %{SOURCE0} -%autosetup -D -T -n rdiscount-%{version} -p0 -gem spec %{SOURCE0} -l --ruby | sed -e 's|,|,\n|g' > rdiscount.gemspec +%setup -q -D -T -n %{gem_name}-%{version} +%patch0 -p0 +gem spec %{SOURCE0} -l --ruby | sed -e 's|,|,\n|g' > %{gem_name}.gemspec + (cd ext; ls -1 *.c *.h | grep -v rdiscount.c ) > discount_files -cat discount_files | while read f ; -do -rm -f ext/$f -sed -i rdiscount.gemspec -e "\@ext/$f@d" +cat discount_files | while read f ; do + rm -f ext/$f + sed -i %{gem_name}.gemspec -e "\@ext/$f@d" done -sed -i ext/extconf.rb -e '\@create_makefile@i \$libs = "-lmarkdown"' \ -%{nil} +sed -i ext/extconf.rb \ + -e '\@create_makefile@i \$libs = "-lmarkdown"' \ + %{nil} %build -rm -rf ./%{gem_extdir_mri} ./%{gem_instdir} -gem build rdiscount.gemspec +rm -rf ./%{gem_extdir_mri} +rm -rf ./%{gem_instdir} +gem build %{gem_name}.gemspec + %gem_install %install rm -rf %{buildroot} -install -d %{buildroot}%{gem_dir} -install -d %{buildroot}%{_mandir}/man1 -install -d %{buildroot}%{_mandir}/man7 +mkdir -p %{buildroot}%{gem_dir} +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man7 mv .%{gem_instdir}/man/rdiscount.1 %{buildroot}%{_mandir}/man1 mv .%{gem_instdir}/man/markdown.7 %{buildroot}%{_mandir}/man7 cp -a .%{gem_dir}/* %{buildroot}%{gem_dir} rm -rf %{buildroot}%{gem_instdir}/ext -install -d %{buildroot}%{gem_extdir_mri} -install -D .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ +mkdir -p %{buildroot}%{gem_extdir_mri} +cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ -install -d %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{_bindir} mv .%{_bindir}/* %{buildroot}/%{_bindir} %check -cd .%{gem_instdir} -ruby -Ilib:ext:. -e 'gem "test-unit" ; Dir.glob("test/*_test.rb").sort.each {|f| require f}' -cd - +pushd .%{gem_instdir} +ruby -Ilib:%{buildroot}%{gem_extdir_mri}:. \ + -e 'gem "test-unit" ; Dir.glob("test/*_test.rb").sort.each {|f| require f}' + +popd %files %{_bindir}/rdiscount %dir %{gem_instdir} %{gem_instdir}/bin/ %{gem_libdir}/ -%{gem_spec} -%{gem_extdir_mri}/ -%exclude %{gem_cache} - - -%files help -%doc %{gem_instdir}/Rakefile %doc %{gem_instdir}/BUILDING %doc %{gem_instdir}/COPYING %doc %{gem_instdir}/README.markdown +%exclude %{gem_cache} +%{gem_spec} +%{gem_extdir_mri}/ +%{_mandir}/man1/rdiscount.1.gz +%exclude %{_mandir}/man7/markdown.7.gz + +%files help +%doc %{gem_instdir}/Rakefile %{gem_docdir} %{gem_instdir}/man %{gem_instdir}/test -%{_mandir}/man1/rdiscount.1.gz %{gem_instdir}/rdiscount.gemspec -%exclude %{_mandir}/man7/markdown.7.gz %changelog +* Fri Aug 11 2023 wubijie - 2.2.0.2-2 +- Use %gem_extdir_mri instead of ext for %check due to ruby3.2 change + * Tue Jun 28 2022 wulei - 2.2.0.2-1 - Upgrade to 2.2.0.2 @@ -97,4 +105,4 @@ cd - - fix missing gcc * Sat Mar 14 2020 zhujunhao - 2.2.0.1-4 -- Package init +- Package init \ No newline at end of file