From 0619018447eb3637374cf4be9b7683bfce4e8c23 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Jun 04 2021 16:39:14 +0000
Subject: Update to sdoc 2.2.0


also enhance .spec and .gitignore files.
Move manual pages into doc subpackage.

Resolves: rhbz#1813607

---

diff --git a/.gitignore b/.gitignore
index b892411..ed1c22a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +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
diff --git a/rubygem-sdoc-version-option-fix.patch b/rubygem-sdoc-version-option-fix.patch
deleted file mode 100644
index 4b112bd..0000000
--- a/rubygem-sdoc-version-option-fix.patch
+++ /dev/null
@@ -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
-
-
-
diff --git a/rubygem-sdoc.spec b/rubygem-sdoc.spec
index cdb0c2f..1cf7aee 100644
--- a/rubygem-sdoc.spec
+++ b/rubygem-sdoc.spec
@@ -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 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # 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 @@ Documentation for %{name}.
 %prep
 %setup -q -n  %{gem_name}-%{version}
 
-%patch0 -p1
-
-
 %build
 gem build ../%{gem_name}-%{version}.gemspec
 %gem_install
@@ -71,22 +65,22 @@ pushd .%{gem_instdir}
 # 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 @@ popd
 %{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
 
diff --git a/sources b/sources
index 79a1982..f3d309c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sdoc-1.0.0.gem) = cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38
+SHA512 (sdoc-2.2.0.gem) = 08ada8718ca8904b59c7c35b7c64db0994222c59222d5769dd36986e5925fab3b59925700050a6b680c60d100cefaae361a1d9f6573de9d80b568d38c0491253