From ece1ff734b9e120e7e5d8c93af29eff72ffb171b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 22 Jan 2020 16:34:54 -0600 Subject: [PATCH 1/5] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 9d55fa101e21621641b40842feb056581d0b75d0 Mon Sep 17 00:00:00 2001 From: Breno B Fernandes Date: Wed, 12 Feb 2020 17:22:36 -0500 Subject: [PATCH 2/5] Revert "Update to YARD 0.9.24." Reverting because we still don't have rubygem-asciidoctor on epel 8. This reverts commit 58c6387799ae67bd41176a04477914ca330dbe0f. --- .gitignore | 1 - rubygem-yard.spec | 36 +++++++++++------------------------- sources | 2 +- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index db073dc..8d45ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ yard-0.5.3.gem /yard-0.8.7.6.gem /yard-0.9.8.gem /yard-0.9.12.gem -/yard-0.9.24.gem diff --git a/rubygem-yard.spec b/rubygem-yard.spec index c33d62f..a5761d8 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,20 +1,16 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.24 -Release: 1%{?dist} +Version: 0.9.12 +Release: 7%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# The 'irb/notifier' might be required for parsing of some old Ruby code. -# https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 -Recommends: rubygem(irb) BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby BuildRequires: rubygem(RedCloth) -BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(bundler) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) @@ -37,7 +33,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} %build # Create the gem as gem install only works on a gem file @@ -57,7 +53,7 @@ mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ -# Some files in 0.9.24 release has still executable bit set :/ +# All files in 0.9.12 release has executable bit set :/ # https://github.com/lsegal/yard/issues/1147 find %{buildroot}%{gem_instdir} -type f | xargs chmod a-x @@ -65,14 +61,14 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %check pushd .%{gem_instdir} +# Get rid of Bundler. +sed -i '/bundler\/setup/ s/^/#/' spec/spec_helper.rb -# There are quite some test mocking File functionality which makes running the -# test suite without Bundler hard. Since the test suite includes Bundler test -# cases, just remove the unnecessary dependencies and run the test suite via -# Bundler. -sed -r -i "/(coveralls|gettext|samus|simplecov)/ s/^/#/" Gemfile +# This is needed, since we are not using Bundler. +sed -i '/allow(File)\.to receive(:exist?).with(\/\\\.yardopts$\/)/ i\ allow(File).to receive(:exist?).and_return(true)' spec/cli/server_spec.rb +sed -i '/expect(File)\.to receive(:file?).with(%r{\/\\\.yard\/yri_cache$})\.and_return(false)/ i\ allow(File).to receive(:file?).and_return(false)' spec/cli/yri_spec.rb -rspec spec +rspec -rspec_helper spec popd %files @@ -80,12 +76,11 @@ popd %{_bindir}/yard %{_bindir}/yardoc %{_bindir}/yri -%exclude %{gem_instdir}/.* +%exclude %{gem_instdir}/.yardopts %license %{gem_instdir}/LEGAL %license %{gem_instdir}/LICENSE %{gem_instdir}/bin %{gem_libdir} -%{gem_instdir}/po %{gem_instdir}/templates %exclude %{gem_cache} %{gem_spec} @@ -93,23 +88,14 @@ popd %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md -%doc %{gem_instdir}/CODE_OF_CONDUCT.md -%doc %{gem_instdir}/CONTRIBUTING.md -%{gem_instdir}/Dockerfile.samus -%{gem_instdir}/Gemfile %doc %{gem_instdir}/README.md %{gem_instdir}/Rakefile -%doc %{gem_instdir}/SECURITY.md %{gem_instdir}/benchmarks %doc %{gem_instdir}/docs -%{gem_instdir}/samus.json %{gem_instdir}/spec %{gem_instdir}/%{gem_name}.gemspec %changelog -* Tue Feb 04 2020 Vít Ondruch - 0.9.24-1 -- Update to YARD 0.9.24. - * Thu Jan 30 2020 Fedora Release Engineering - 0.9.12-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index a47ab0e..ee48adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yard-0.9.24.gem) = c6a270eeb214230f349d038889c72ee21a19756b4aeda2827c397000092e4bdd16109c4e8605f1b4a962e15ffe9aae1013d2ecf7ab5a0948f5e5ce3dd7b8cf55 +SHA512 (yard-0.9.12.gem) = e26d759e80c9f76aa9b990ee01e6be9afad61ad49d6c7941b8ade262a42717782815383f8ef757eacea9b0b87dc48da3d3a4effa966ecb0bf8b989a195f64c70 From ece3762ef8a2cdf56f46a711fe7c0aab03445681 Mon Sep 17 00:00:00 2001 From: Breno B Fernandes Date: Thu, 13 Feb 2020 09:56:25 -0500 Subject: [PATCH 3/5] Rebuilt for EPEL8. --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index a5761d8..2f71f0c 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Wed Feb 12 2020 Breno Brand Fernandes - 0.9.12-8 +- Rebuilt for EPEL8. + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.12-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 57c7eeae8f11e2d85dba83ae57b7830e9018db1a Mon Sep 17 00:00:00 2001 From: Breno B Fernandes Date: Thu, 13 Feb 2020 10:20:26 -0500 Subject: [PATCH 4/5] Added rake and rubygems as dependencies. --- rubygem-yard.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 2f71f0c..7508128 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -10,11 +10,14 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby +BuildRequires: rubygems BuildRequires: rubygem(RedCloth) BuildRequires: rubygem(bundler) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) +BuildRequires: rubygem(rake) +Requires: rubygems BuildArch: noarch %description @@ -27,6 +30,8 @@ custom Ruby constructs such as custom class level definitions. %package doc Summary: Documentation for %{name} Requires: %{name} = %{version}-%{release} +BuildRequires: rubygems +Requires: rubygems BuildArch: noarch %description doc From d144873503252ddfa28f186f15d87239dc01984f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:48:49 +0000 Subject: [PATCH 5/5] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file