public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rubygem-sprockets] rawhide: Apply upstream patch to support json 3
@ 2026-09-20  6:53 Mamoru TASAKA
  0 siblings, 0 replies; only message in thread
From: Mamoru TASAKA @ 2026-09-20  6:53 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rubygem-sprockets
Branch : rawhide
Commit : 65b6768893ddb93a86b0b65a29a76804858b0d90
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-09-20T15:53:07+09:00
Stats  : +58/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-sprockets/c/65b6768893ddb93a86b0b65a29a76804858b0d90?branch=rawhide

Log:
Apply upstream patch to support json 3

---
diff --git a/rubygem-sprockets-pr829-support-json3.patch b/rubygem-sprockets-pr829-support-json3.patch
new file mode 100644
index 0000000..f88d2e6
--- /dev/null
+++ b/rubygem-sprockets-pr829-support-json3.patch
@@ -0,0 +1,50 @@
+From 6c9f00b178e81b0538f3ba313665221351d99c71 Mon Sep 17 00:00:00 2001
+From: Juanito Fatas <me@juanitofatas.com>
+Date: Tue, 11 Aug 2026 22:05:37 +0900
+Subject: [PATCH] Support JSON 3
+
+---
+ lib/sprockets/bower.rb    | 2 +-
+ lib/sprockets/manifest.rb | 2 +-
+ lib/sprockets/npm.rb      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/sprockets/bower.rb b/lib/sprockets/bower.rb
+index e99220052..77175fb6c 100644
+--- a/lib/sprockets/bower.rb
++++ b/lib/sprockets/bower.rb
+@@ -46,7 +46,7 @@ def resolve_alternates(load_path, logical_path)
+     #
+     # Returns nothing.
+     def read_bower_main(dirname, filename)
+-      bower = JSON.parse(File.read(filename), create_additions: false)
++      bower = JSON.parse(File.read(filename))
+ 
+       case bower['main']
+       when String
+diff --git a/lib/sprockets/manifest.rb b/lib/sprockets/manifest.rb
+index 6bb65e865..c18506a48 100644
+--- a/lib/sprockets/manifest.rb
++++ b/lib/sprockets/manifest.rb
+@@ -315,7 +315,7 @@ def exporters_for_asset(asset)
+       end
+ 
+       def json_decode(obj)
+-        JSON.parse(obj, create_additions: false)
++        JSON.parse(obj)
+       end
+ 
+       def json_encode(obj)
+diff --git a/lib/sprockets/npm.rb b/lib/sprockets/npm.rb
+index 639123461..c188793b8 100644
+--- a/lib/sprockets/npm.rb
++++ b/lib/sprockets/npm.rb
+@@ -37,7 +37,7 @@ def resolve_alternates(load_path, logical_path)
+     #
+     # Returns nothing.
+     def read_package_directives(dirname, filename)
+-      package = JSON.parse(File.read(filename), create_additions: false)
++      package = JSON.parse(File.read(filename))
+ 
+       case package['main']
+       when String

diff --git a/rubygem-sprockets.spec b/rubygem-sprockets.spec
index 6e3bdd1..2fc4903 100644
--- a/rubygem-sprockets.spec
+++ b/rubygem-sprockets.spec
@@ -3,7 +3,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 4.2.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Rack-based asset packaging system
 License: MIT
 URL: https://github.com/rails/sprockets
@@ -16,6 +16,9 @@ Source1: sprockets-%{version}-tests.tar.gz
 Patch0: rubygem-sprockets-4.2.0-Fix-Minitest-constant-name-in-tests.patch
 # Fix compatibility with minitest 6
 Patch1: rubygem-sprockets-4.2.0-minitest6.patch
+# Support json 3
+# https://github.com/rails/sprockets/pull/829
+Patch2: rubygem-sprockets-pr829-support-json3.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby >= 2.5.0
@@ -49,6 +52,7 @@ Documentation for %{name}.
 
 %prep
 %setup -q -n %{gem_name}-%{version} -b 1
+%patch 2 -p1
 
 pushd %{_builddir}
 %patch 0 -p1
@@ -215,6 +219,9 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Sun Sep 13 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.0-12
+- Apply upstream patch to support json 3
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-20  6:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-20  6:53 [rpms/rubygem-sprockets] rawhide: Apply upstream patch to support json 3 Mamoru TASAKA

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox