PR#1: Update to sdoc 2.2.0 - rpms/rubygem-sdoc

rpms / rubygem-sdoc

#1 Update to sdoc 2.2.0

Merged 2 years ago by pvalena. Opened 3 years ago by pvalena.

rpms/ pvalena/rubygem-sdoc rebase into rawhide

Update to sdoc 2.2.0

Pavel Valena • 2 years ago

0619018

.gitignore

file modified

+1 -5

		`@@ -1,5 +1,1 @@`
		`- /sdoc-0.3.20.gem`
		`- /sdoc-0.4.0.gem`
		`- /sdoc-0.4.1.gem`
		`- /sdoc-0.4.2.gem`
		`- /sdoc-1.0.0.gem`
		`+ /sdoc-*.gem`

rubygem-sdoc-version-option-fix.patch

file removed

-20

		`@@ -1,20 +0,0 @@`
		`- diff --git a/bin/sdoc b/bin/sdoc`
		`- index 78640fe..0ba391d 100755`
		`- --- a/bin/sdoc`
		`- +++ b/bin/sdoc`
		`- @@ -1,6 +1,12 @@`
		`- #!/usr/bin/env ruby -KU`
		`- require 'sdoc'`
		`-`
		`- +if ARGV.include?('--version') \|\| ARGV.include?('-v')`
		`- + require 'sdoc/version'`
		`- + puts "sdoc #{SDoc::VERSION}"`
		`- + exit 0`
		`- +end`
		`- +`
		`- begin`
		`- ARGV.unshift('--format=sdoc') if ARGV.grep(/\A(-f\|--fmt\|--format\|-r\|-R\|--ri\|--ri-site)\b/).empty?`
		`- r = RDoc::RDoc.new`
		`-`
		`-`
		`-`

rubygem-sdoc.spec

file modified

+14 -13

		`@@ -2,8 +2,8 @@`
		`%global gem_name sdoc`

		`Name: rubygem-%{gem_name}`
		`- Version: 1.0.0`
		`- Release: 7%{?dist}`
		`+ Version: 2.2.0`
		`+ Release: 1%{?dist}`
		`Summary: RDoc generator to build searchable HTML documentation for Ruby code`
		`# License needs to take RDoc and Darkfish into account apparantly`
		`# https://github.com/voloko/sdoc/issues/27`
		`@@ -15,9 +15,6 @@`
		`# https://github.com/voloko/sdoc/pull/49`
		`Source1: sdoc.1`
		`Source2: sdoc-merge.1`
		`- # Fix sdoc --version to return the correct version`
		`- # https://github.com/zzak/sdoc/issues/125`
		`- Patch0: rubygem-sdoc-version-option-fix.patch`
		`# JSON dependency is still required, although upstream dopped the referrence.`
		`# https://github.com/zzak/sdoc/commit/c28efc8d4ebe0a50ed1072f3e4041657b149b634`
		`Requires: rubygem(json)`
		`@@ -42,9 +39,6 @@`
		`%prep`
		`%setup -q -n %{gem_name}-%{version}`

		`- %patch0 -p1`
		`-`
		`-`
		`%build`
		`gem build ../%{gem_name}-%{version}.gemspec`
		`%gem_install`
		`@@ -71,22 +65,22 @@`
		`# Get rid of Bundler`
		`sed -i "/require 'bundler\/setup'/ s/^/#/" ./spec/spec_helper.rb`

		`- ruby -Ilib:spec -e 'Dir.glob "./spec/*.rb", &method(:require)'`
		`+ RUBYOPT='-Ilib:spec' \`
		`+ ruby -e 'Dir.glob "./spec/*.rb", &method(:require)'`
		`popd`

		`%files`
		`%dir %{gem_instdir}`
		`%{_bindir}/sdoc`
		`%{_bindir}/sdoc-merge`
		`- %exclude %{gem_instdir}/.gitignore`
		`- %exclude %{gem_instdir}/.travis.yml`
		`+ %exclude %{gem_instdir}/.*`
		`%license %{gem_instdir}/LICENSE`
		`%{gem_instdir}/bin`
		`%{gem_libdir}`
		`%exclude %{gem_cache}`
		`+ %exclude %{gem_instdir}/config.ru`
		`+ %exclude %{gem_instdir}/netlify.toml`
		`%{gem_spec}`
		`- %doc %{_mandir}/man1/sdoc-merge.1*`
		`- %doc %{_mandir}/man1/sdoc.1*`

		`%files doc`
		`%doc %{gem_docdir}`
		`@@ -96,8 +90,15 @@`
		`%{gem_instdir}/Rakefile`
		`%{gem_instdir}/sdoc.gemspec`
		`%{gem_instdir}/spec`
		`+ %doc %{_mandir}/man1/sdoc-merge.1*`
		`+ %doc %{_mandir}/man1/sdoc.1*`

		`%changelog`
		`+ * Fri Jun 04 2021 Pavel Valena <pvalena@redhat.com> - 2.2.0-1`
		`+ - Update to sdoc 2.2.0.`
		`+ Resolves: rhbz#1813607`
		`+ - Move manual pages into doc subpackage.`
		`+`
		`* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-7`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (sdoc-1.0.0.gem) = cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38`
		`+ SHA512 (sdoc-2.2.0.gem) = 08ada8718ca8904b59c7c35b7c64db0994222c59222d5769dd36986e5925fab3b59925700050a6b680c60d100cefaae361a1d9f6573de9d80b568d38c0491253`

pvalena commented 3 years ago

To have latest sdoc gem in Fedora.

TBD

Update log: https://git.io/JkQbf

vondruch commented 2 years ago

There is 2.2.0 available already. And since there nothing depends on SDoc in Fedora, I'd suggest to orphan it and let it go.

rebased onto f9be929

2 years ago

pvalena commented 2 years ago

Bumped version, retesting.

rebased onto 0fd46ec

2 years ago

rebased onto 0619018

2 years ago

vondruch commented 2 years ago

LGTM

Pull-Request has been merged by pvalena

2 years ago

pvalena commented 2 years ago

Thanks! Blind spot here - the tests didn't finish (I didn't post them), but it was auto-merged + auto built. I should probably push only stuff that builds :) .

FTR, the tests:

To have latest sdoc gem in Fedora.

Koji scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=69317745

Copr build:
https://copr.fedorainfracloud.org/coprs/build/2225995

Checks: