rpms / rubygem-jekyll

Clone
Source Code
GIT

#6 update to version 4.2.0
Closed 3 years ago by oturpe. Opened 3 years ago by decathorpe.
Unknown source master  into  rawhide

file modified
+2 
@@ -20,3 +20,5 @@
 

  /jekyll-4.1.0.tar.gz
 

  /jekyll-4.1.1.gem
 

  /jekyll-4.1.1.tar.gz
 

+ /jekyll-4.2.0.gem
 

+ /jekyll-4.2.0.tar.gz

file modified
+5 -5 
@@ -1,7 +1,7 @@
 

- From 6b3e6b9d8e2607b34e8cfa36d81bd44734637cf6 Mon Sep 17 00:00:00 2001
 

+ From c5a7950a7da57be2cfcf3706d99628a71e3f66eb Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:25:42 +0200
 

- Subject: [PATCH 0/7] jekyll/commands: remove "bundle install" step for "new"
 

+ Subject: [PATCH 0/8] jekyll/commands: remove "bundle install" step for "new"
 

  

  ---
 

   lib/jekyll/commands/new.rb | 30 +-----------------------------
 
@@ -9,7 +9,7 @@
 

   2 files changed, 1 insertion(+), 39 deletions(-)
 

  

  diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb
 

- index 4623ddaf..5645d9ec 100644
 

+ index 4623ddafb..5645d9ec3 100644
 

  --- a/lib/jekyll/commands/new.rb
 

  +++ b/lib/jekyll/commands/new.rb
 

  @@ -13,7 +13,6 @@ module Jekyll
 
@@ -59,7 +59,7 @@
 

         end
 

       end
 

  diff --git a/test/test_new_command.rb b/test/test_new_command.rb
 

- index 7419ec6e..8940679e 100644
 

+ index c71cf4188..79538ab03 100644
 

  --- a/test/test_new_command.rb
 

  +++ b/test/test_new_command.rb
 

  @@ -47,9 +47,7 @@ class TestNewCommand < JekyllUnitTest
 
@@ -96,5 +96,5 @@
 

   

     context "when multiple args are given" do
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+5 -5 
@@ -1,14 +1,14 @@
 

- From 48d352f637b71e60f13f118f1032fbfd5d707dfb Mon Sep 17 00:00:00 2001
 

+ From b1b3963ecdb48b8ae5d42ad64d9e6e53c8fdd105 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:26:59 +0200
 

- Subject: [PATCH 1/7] test/helper: disable simplecov and minitest plugins
 

+ Subject: [PATCH 1/8] test/helper: disable simplecov and minitest plugins
 

  

  ---
 

   test/helper.rb | 21 ---------------------
 

   1 file changed, 21 deletions(-)
 

  

  diff --git a/test/helper.rb b/test/helper.rb
 

- index 479cdf9c..1d53f147 100644
 

+ index 158993a85..953d8d878 100644
 

  --- a/test/helper.rb
 

  +++ b/test/helper.rb
 

  @@ -11,24 +11,10 @@ def jruby?
 
@@ -34,7 +34,7 @@
 

  -require "minitest/reporters"
 

  -require "minitest/profile"
 

   require "rspec/mocks"
 

-  require_relative "../lib/jekyll.rb"
 

+  require_relative "../lib/jekyll"
 

   

  @@ -41,13 +27,6 @@ include Jekyll
 

   
@@ -51,5 +51,5 @@
 

     def assert_exist(filename, msg = nil)
 

       msg = message(msg) { "Expected '#{filename}' to exist" }
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+4 -4 
@@ -1,14 +1,14 @@
 

- From 784b139e6a4f502a7bae612578f5f92abe3a17b4 Mon Sep 17 00:00:00 2001
 

+ From 5702eef6e629d89ee2c9cc118af0de4c089ba462 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:27:48 +0200
 

- Subject: [PATCH 2/7] test/utils: remove internet connectivity test
 

+ Subject: [PATCH 2/8] test/utils: remove internet connectivity test
 

  

  ---
 

   test/test_utils.rb | 6 ------
 

   1 file changed, 6 deletions(-)
 

  

  diff --git a/test/test_utils.rb b/test/test_utils.rb
 

- index 1b3534e4..4ba3ec94 100644
 

+ index 1b3534e4f..4ba3ec940 100644
 

  --- a/test/test_utils.rb
 

  +++ b/test/test_utils.rb
 

  @@ -424,10 +424,4 @@ class TestUtils < JekyllUnitTest
 
@@ -23,5 +23,5 @@
 

  -  end
 

   end
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+8 -8 
@@ -1,7 +1,7 @@
 

- From bd3b0cb92c31d7c4e307c44cc5cfc4ea97e39fbf Mon Sep 17 00:00:00 2001
 

+ From ccf28294d373cee6ea6be39fe4855b84b04567ef Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Wed, 27 May 2020 15:09:27 +0200
 

- Subject: [PATCH 3/7] test: disable tests requiring the test theme
 

+ Subject: [PATCH 3/8] test: disable tests requiring the test theme
 

  

  ---
 

   test/test_layout_reader.rb       |   9 ---
 
@@ -14,7 +14,7 @@
 

   delete mode 100644 test/test_theme_assets_reader.rb
 

  

  diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
 

- index 0ba64ebd..0dfd0fea 100644
 

+ index 0ba64ebd7..0dfd0fea9 100644
 

  --- a/test/test_layout_reader.rb
 

  +++ b/test/test_layout_reader.rb
 

  @@ -69,15 +69,6 @@ class TestLayoutReader < JekyllUnitTest
 
@@ -34,7 +34,7 @@
 

     end
 

   end
 

  diff --git a/test/test_liquid_renderer.rb b/test/test_liquid_renderer.rb
 

- index 40795801..8739ada5 100644
 

+ index 40795801f..8739ada54 100644
 

  --- a/test/test_liquid_renderer.rb
 

  +++ b/test/test_liquid_renderer.rb
 

  @@ -26,33 +26,5 @@ class TestLiquidRenderer < JekyllUnitTest
 
@@ -72,7 +72,7 @@
 

     end
 

   end
 

  diff --git a/test/test_site.rb b/test/test_site.rb
 

- index eabfe346..a4696f23 100644
 

+ index 642c69626..2347daf64 100644
 

  --- a/test/test_site.rb
 

  +++ b/test/test_site.rb
 

  @@ -64,18 +64,6 @@ class TestSite < JekyllUnitTest
 
@@ -131,7 +131,7 @@
 

       context "with liquid profiling" do
 

  diff --git a/test/test_theme.rb b/test/test_theme.rb
 

  deleted file mode 100644
 

- index bfbe151f..00000000
 

+ index bfbe151f5..000000000
 

  --- a/test/test_theme.rb
 

  +++ /dev/null
 

  @@ -1,85 +0,0 @@
 
@@ -222,7 +222,7 @@
 

  -end
 

  diff --git a/test/test_theme_assets_reader.rb b/test/test_theme_assets_reader.rb
 

  deleted file mode 100644
 

- index 02ce004f..00000000
 

+ index 02ce004fa..000000000
 

  --- a/test/test_theme_assets_reader.rb
 

  +++ /dev/null
 

  @@ -1,103 +0,0 @@
 
@@ -330,5 +330,5 @@
 

  -  end
 

  -end
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+4 -4 
@@ -1,7 +1,7 @@
 

- From a99073e4e81b7713e16872fe691a67b7a3b355e4 Mon Sep 17 00:00:00 2001
 

+ From 83613048b857eb58cde045d46b968a3c2f8e8755 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:31:44 +0200
 

- Subject: [PATCH 4/7] tests/related_posts: disable tests requiring
 

+ Subject: [PATCH 4/8] tests/related_posts: disable tests requiring
 

   classifier-reborn
 

  

  ---
 
@@ -11,7 +11,7 @@
 

  

  diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb
 

  deleted file mode 100644
 

- index 7f9a978f..00000000
 

+ index 7f9a978f1..000000000
 

  --- a/test/test_related_posts.rb
 

  +++ /dev/null
 

  @@ -1,66 +0,0 @@
 
@@ -82,5 +82,5 @@
 

  -  end
 

  -end
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+4 -4 
@@ -1,7 +1,7 @@
 

- From 40f9467ce01a4658000dbb524ad9ec49e487c336 Mon Sep 17 00:00:00 2001
 

+ From 8168e8ed03276e13e1f7bc784f7c003e6e6ab9a1 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:32:13 +0200
 

- Subject: [PATCH 5/7] test/coffeescript: disable tests requiring coffeescript
 

+ Subject: [PATCH 5/8] test/coffeescript: disable tests requiring coffeescript
 

  

  ---
 

   test/test_coffeescript.rb | 49 ---------------------------------------
 
@@ -10,7 +10,7 @@
 

  

  diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
 

  deleted file mode 100644
 

- index 6c6c376b..00000000
 

+ index 6c6c376b2..000000000
 

  --- a/test/test_coffeescript.rb
 

  +++ /dev/null
 

  @@ -1,49 +0,0 @@
 
@@ -64,5 +64,5 @@
 

  -  end
 

  -end
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+4 -4 
@@ -1,7 +1,7 @@
 

- From 55d936a3db855e062072d5ba702e07d2ae1b914c Mon Sep 17 00:00:00 2001
 

+ From d6d800f21c002d33856d79dd0168ddef0997cb95 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Mon, 26 Aug 2019 10:33:42 +0200
 

- Subject: [PATCH 6/7] test/plugin_manager: disable tests requiring gemspec and
 

+ Subject: [PATCH 6/8] test/plugin_manager: disable tests requiring gemspec and
 

   Gemfile
 

  

  ---
 
@@ -9,7 +9,7 @@
 

   1 file changed, 22 deletions(-)
 

  

  diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb
 

- index b5d1a81c..2ba4e209 100644
 

+ index b5d1a81ca..2ba4e2095 100644
 

  --- a/test/test_plugin_manager.rb
 

  +++ b/test/test_plugin_manager.rb
 

  @@ -10,16 +10,6 @@ class TestPluginManager < JekyllUnitTest
 
@@ -49,5 +49,5 @@
 

       should "invoke `require_with_graceful_fail`" do
 

         gems = %w(jemojii foobar)
 

  -- 

- 2.26.2
 

+ 2.29.2

file modified
+4 -4 
@@ -1,14 +1,14 @@
 

- From ae9d8fa12f4e441978def76ffec6fa04478b3060 Mon Sep 17 00:00:00 2001
 

+ From aecdd366945d05e8724df849fd9fcb612a5725d7 Mon Sep 17 00:00:00 2001
 

  From: Fabio Valentini <decathorpe@gmail.com>
 

  Date: Thu, 29 Aug 2019 01:16:32 +0200
 

- Subject: [PATCH 7/7] test/kramdown: disable race-y test
 

+ Subject: [PATCH 7/8] test/kramdown: disable race-y test
 

  

  ---
 

   test/test_kramdown.rb | 18 ------------------
 

   1 file changed, 18 deletions(-)
 

  

  diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
 

- index c95f05d8..37bf29eb 100644
 

+ index c95f05d84..37bf29eb1 100644
 

  --- a/test/test_kramdown.rb
 

  +++ b/test/test_kramdown.rb
 

  @@ -136,24 +136,6 @@ class TestKramdown < JekyllUnitTest
 
@@ -37,5 +37,5 @@
 

           override = {
 

             "kramdown" => {
 

  -- 

- 2.26.2
 

+ 2.29.2

file added
+25 
@@ -0,0 +1,25 @@
 

+ From 8067b3870101506e89a9f9b6640b59b9e46bd9cc Mon Sep 17 00:00:00 2001
 

+ From: Fabio Valentini <decathorpe@gmail.com>
 

+ Date: Thu, 28 Jan 2021 19:57:58 +0100
 

+ Subject: [PATCH 8/8] test/generated_site: fix compatibility with Ruby 3.0
 

+ 

+ ---
 

+  test/test_generated_site.rb | 2 +-
 

+  1 file changed, 1 insertion(+), 1 deletion(-)
 

+ 

+ diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
 

+ index 3b469f82a..5b9b9cb24 100644
 

+ --- a/test/test_generated_site.rb
 

+ +++ b/test/test_generated_site.rb
 

+ @@ -11,7 +11,7 @@ class TestGeneratedSite < JekyllUnitTest
 

+        @site.process
 

+        @index = File.read(
 

+          dest_dir("index.html"),
 

+ -        Utils.merged_file_read_opts(@site, {})
 

+ +        **Utils.merged_file_read_opts(@site, {})
 

+        )
 

+      end
 

+  

+ -- 

+ 2.29.2
 

+

file modified
+26 -16 
@@ -2,41 +2,47 @@
 

  

  Name:           rubygem-%{gem_name}
 

  Summary:        Simple, blog aware, static site generator
 

- Version:        4.1.1
 

- Release:        3%{?dist}
 

+ Version:        4.2.0
 

+ Release:        1%{?dist}
 

  License:        MIT
 

  

  URL:            https://github.com/jekyll/jekyll
 

  Source0:        https://rubygems.org/gems/%{gem_name}-%{version}.gem
 

  Source1:        %{url}/archive/v%{version}/%{gem_name}-%{version}.tar.gz
 

  

- # Patch the "new" command to skip the "bundle install" step
 

+ # downstream patches maintained at https://pagure.io/jekyll-fedora/jekyll
 

+ 

+ # patch the "new" command to skip the "bundle install" step
 

  Patch0:         0000-jekyll-commands-remove-bundle-install-step-for-new.patch
 

  

- # Patch test helper to disable code coverage and minitest plugins
 

+ # patch test helper to disable code coverage and minitest plugins
 

  Patch1:         0001-test-helper-disable-simplecov-and-minitest-plugins.patch
 

  

- # Patch to remove (failing) internet connectivity check
 

+ # patch to remove (failing) internet connectivity check
 

  Patch2:         0002-test-utils-remove-internet-connectivity-test.patch
 

  

- # Patch to disable broken tests using the "test-theme" theme
 

+ # patch to disable broken tests using the "test-theme" theme
 

  Patch3:         0003-test-disable-tests-requiring-the-test-theme.patch
 

  

- # Patches to remove tests for optional functionality with missing dependencies:
 

+ # patches to remove tests for optional functionality with missing dependencies:
 

  # classifier-reborn, jekyll-coffeescript, pygments.rb, tomlrb
 

  Patch4:         0004-tests-related_posts-disable-tests-requiring-classifi.patch
 

  Patch5:         0005-test-coffeescript-disable-tests-requiring-coffeescri.patch
 

  

- # Patch to disable tests reliant on the Gemfile and .gemspec file,
 

+ # patch to disable tests reliant on the Gemfile and .gemspec file,
 

  # which are not shipped as part of the jekyll gem:
 

  Patch6:         0006-test-plugin_manager-disable-tests-requiring-gemspec-.patch
 

  

- # Patch to disable a race-y test that fails regularly
 

+ # patch to disable a race-y test that fails regularly
 

  Patch7:         0007-test-kramdown-disable-race-y-test.patch
 

  

+ # patch to make tests compatible with Ruby 3.0
 

+ # https://github.com/jekyll/jekyll/commit/5c797ba
 

+ Patch8:         0008-test-generated_site-fix-compatibility-with-Ruby-3.0.patch
 

+ 

  BuildRequires:  ruby(release)
 

  BuildRequires:  rubygems-devel
 

- BuildRequires:  ruby >= 2.1.0
 

+ BuildRequires:  ruby >= 2.4.0
 

  

  BuildRequires:  help2man
 

  
@@ -62,19 +68,20 @@
 

  BuildRequires:  rubygem(safe_yaml)
 

  BuildRequires:  rubygem(shoulda)
 

  BuildRequires:  rubygem(terminal-table)
 

- BuildRequires:  rubygem(tomlrb)
 

+ BuildRequires:  rubygem(tomlrb) >= 2.0.1
 

+ BuildRequires:  rubygem(webrick)
 

  

- # Additional gems required to run jekyll:
 

+ # additional gems required to run jekyll
 

  Requires:       rubygem(bigdecimal)
 

  Requires:       rubygem(bundler)
 

  Requires:       rubygem(json)
 

  

- # Additional gems needed to actually deploy jekyll with default settings:
 

+ # additional gems needed to actually deploy jekyll with default settings
 

  Recommends:     rubygem(jekyll-feed)
 

  Recommends:     rubygem(jekyll-seo-tag)
 

  Recommends:     rubygem(minima)
 

  

- # Provide "jekyll", since this package ships a binary
 

+ # provide "jekyll", since this package ships a binary
 

  Provides:       %{gem_name} = %{version}-%{release}
 

  

  BuildArch:      noarch
 
@@ -115,6 +122,7 @@
 

  %patch5 -p1
 

  %patch6 -p1
 

  %patch7 -p1
 

+ %patch8 -p1
 

  

  # mercenary is too old in fedora (0.3.6 vs. 0.4.0)
 

  %gemspec_remove_dep -g mercenary "~> 0.4.0"
 
@@ -136,8 +144,7 @@
 

  

  find %{buildroot}%{gem_instdir}/exe -type f | xargs chmod a+x
 

  

- 

- # Build man page from "jekyll --help" output
 

+ # build man page from "jekyll --help" output
 

  export GEM_PATH="%{buildroot}/%{gem_dir}:%{gem_dir}"
 

  

  mkdir -p %{buildroot}%{_mandir}/man1
 
@@ -174,6 +181,9 @@
 

  

  

  %changelog
 

+ * Thu Jan 28 2021 Fabio Valentini <decathorpe@gmail.com> - 4.2.0-1
 

+ - Update to version 4.2.0.
 

+ 

  * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-3
 

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

file modified
+2 -2 
@@ -1,2 +1,2 @@
 

- SHA512 (jekyll-4.1.1.gem) = 1718aba3c94662c3de3a644a3169847e51d711736fc9ab166e459f94b1c03a0f3a8678892481b935475455cab461a3c0625354aa0998b1bf0040fda1185f153a
 

- SHA512 (jekyll-4.1.1.tar.gz) = 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
 

+ SHA512 (jekyll-4.2.0.gem) = bef32d360ca2d6c8bd226f9485f4ed24348cb0f8747e5a230dea42417c8fa821e009a7e92c1f454cb5dd7759011db145e505658feb3e0266910afbe63754cabe
 

+ SHA512 (jekyll-4.2.0.tar.gz) = aee4d832631a285c3d37576b5f3d80073b56afefcb8c8a19a74435ce431b606b5cedc28a02c8e3930f9bc35ab432c952f96e1878b3bee6b9d33fbd01f0a147ec

Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.