diff --git a/.gitignore b/.gitignore index 89ae688..5778047 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/redcarpet-*gem -/redcarpet-*-test-missing-files.tar.gz +/redcarpet-2.1.1.gem +/redcarpet-3.3.2.gem diff --git a/redcarpet-create-missing-test-files.sh b/redcarpet-create-missing-test-files.sh deleted file mode 100644 index 3c49d3d..0000000 --- a/redcarpet-create-missing-test-files.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -usage() { - echo "$0 " -} - -set -e -set -x - -if [ $# -lt 1 ] ; then - usage - exit 1 -fi - -VERSION=$1 - -GEMNAME=redcarpet -TMPDIR=$(mktemp -d /var/tmp/${GEMNAME}-XXXXXX) -CURDIR=$(pwd) -GITTOPDIR=${GEMNAME}-${VERSION} - -pushd $TMPDIR - -git clone http://github.com/vmg/${GEMNAME} ${GITTOPDIR} -cd ${GEMNAME}-$VERSION - -git checkout -b fedora-$VERSION v$VERSION || true -cd .. - -tar czf $CURDIR/${GEMNAME}-${VERSION}-test-missing-files.tar.gz \ - ${GITTOPDIR}/test/ \ - -popd -rm -rf $TMPDIR - diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec index 23037f3..51afebb 100644 --- a/rubygem-redcarpet.spec +++ b/rubygem-redcarpet.spec @@ -1,46 +1,40 @@ %global gem_name redcarpet -Name: rubygem-%{gem_name} -Version: 3.6.1 -Release: 3%{?dist} - -Summary: A fast, safe and extensible Markdown to (X)HTML parser -# SPDX confirmed -License: MIT -URL: http://github.com/vmg/redcarpet -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: %{gem_name}-%{version}-test-missing-files.tar.gz -# Source1 is created by $ bash %%SOURCE2 %%version -Source2: %{gem_name}-create-missing-test-files.sh - -BuildRequires: gcc -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby-devel -BuildRequires: rubygem(test-unit) +Name: rubygem-%{gem_name} +Version: 3.3.2 +Release: 19%{?dist} +Summary: A fast, safe and extensible Markdown to (X)HTML parser +# https://github.com/vmg/redcarpet/issues/502 +License: MIT and ISC +URL: http://github.com/vmg/redcarpet +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: gcc +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel +BuildRequires: rubygem(test-unit) %description A fast, safe and extensible Markdown to (X)HTML parser. -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -%description doc +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -b1 -cp -p ../%{gem_name}-%{version}.gemspec . - -%build -gem build ./%{gem_name}-%{version}.gemspec -%gem_install +%setup -q -c -T +%gem_install -n %{SOURCE0} # https://github.com/vmg/redcarpet/pull/503 chmod a-x .%{gem_instdir}/ext/redcarpet/html.c +%build + %install mkdir -p %{buildroot}%{gem_dir} cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/ @@ -50,102 +44,36 @@ cp -a ./%{_bindir}/* %{buildroot}%{_bindir} chmod 755 %{buildroot}%{_bindir}/redcarpet mkdir -p %{buildroot}%{gem_extdir_mri} -cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} \ - %{buildroot}%{gem_extdir_mri}/ +cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ -# cleanups -pushd %{buildroot}%{gem_instdir} # Prevent dangling symlink in -debuginfo. -rm -rf \ - Gemfile \ - Rakefile \ - ext/ \ - test/ \ - %{gem_name}.gemspec \ - %{nil} -popd -rm -f %{buildroot}%{gem_cache} +rm -rf %{buildroot}%{gem_instdir}/ext %check -cp -a test/ .%{gem_instdir}/ - pushd .%{gem_instdir} -env \ - RUBYOPT=-Ilib:$(dirs +1)%{gem_extdir_mri}:test \ - ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' +RUBYOPT=-Ilib:$(dirs +1)%{gem_extdir_mri}:test ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' popd %files -%dir %{gem_instdir} -%license %{gem_instdir}/COPYING -%doc %{gem_instdir}/README.markdown - +%dir %{gem_instdir} %{_bindir}/redcarpet - %{gem_instdir}/bin %{gem_libdir} %{gem_extdir_mri} - +%exclude %{gem_cache} %{gem_spec} +%license %{gem_instdir}/COPYING +%doc %{gem_instdir}/README.markdown %files doc +%{gem_instdir}/Gemfile +%{gem_instdir}/Rakefile +%{gem_instdir}/test +%{gem_instdir}/%{gem_name}.gemspec %doc %{gem_docdir} -%{gem_instdir}/CHANGELOG.md -%{gem_instdir}/CONTRIBUTING.md + %changelog -* Thu Jan 08 2026 Vít Ondruch - 3.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_4.0 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Feb 27 2025 Mamoru TASAKA - 3.6.1-1 -- 3.6.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 3.6.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 08 2025 Mamoru TASAKA - 3.6.0-7 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 - -* Fri Jul 19 2024 Fedora Release Engineering - 3.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jan 26 2024 Fedora Release Engineering - 3.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 03 2024 Mamoru TASAKA - 3.6.0-4 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 - -* Fri Jul 21 2023 Fedora Release Engineering - 3.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Apr 30 2023 Mamoru TASAKA - 3.6.0-2 -- 3.6.0 -- License changed to MIT (SPDX confimred) -- CVE-2020-26298 is fixed in this version - -* Fri Jan 20 2023 Fedora Release Engineering - 3.3.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 04 2023 Mamoru TASAKA - 3.3.2-24 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 - -* Sat Jul 23 2022 Fedora Release Engineering - 3.3.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 26 2022 Mamoru TASAKA - 3.3.2-22 -- F-36: rebuild against ruby31 -- modernize spec file, especially move %%gem_install to %%build - to fix FTBFS with package_notes - -* Fri Jan 21 2022 Fedora Release Engineering - 3.3.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.3.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Wed Jan 27 2021 Fedora Release Engineering - 3.3.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 34f4212..98561bb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (redcarpet-3.6.1.gem) = 220452e147507604394ff5f3f2747cfc17da1e467bd59a54ed47ec46d2ffdaa1f505eb2a1c62723639d20f674e5e84014d55cf1b5d55b65c7ddee2d363a03812 -SHA512 (redcarpet-3.6.1-test-missing-files.tar.gz) = 1af8292c4289092b8adf2252e0586d7ec70120058690072087a6bf942ab1d10a25062078df506a45a9d45fe3075ec7cff8a489aa8f06c6b8fb2d1bb51ceba441 +048b42d499b37c6dd02f2e438758f9b0 redcarpet-3.3.2.gem