[rpms/cjs] f43: Merge branch 'f44' into f43

[rpms/cjs] f43: Merge branch 'f44' into f43

[Leigh Scott]

A new commit has been pushed.

Repo   : rpms/cjs
Branch : f43
Commit : 2c997f47e94c5e9f2e44217c8d462c4503682a35
Author : Leigh Scott <leigh123linux@gmail.com>
Date   : 2026-06-01T13:53:56+01:00
Stats  : +27/-22 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/cjs/c/2c997f47e94c5e9f2e44217c8d462c4503682a35?branch=f43

Log:
Merge branch 'f44' into f43

---
diff --git a/cjs.spec b/cjs.spec
index 33f6ea6..cc879fc 100644
--- a/cjs.spec
+++ b/cjs.spec
@@ -1,17 +1,12 @@
-%global commit0 9f89ac464ad879a4eb49bba929476ce50dda012b
-%global date 20251023
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global tag %{version}
-
 %global glib2_version 2.66.0
 %global gobject_introspection_version 1.66.0
 %global gtk3_version 3.20
-%global mozjs128_version 128.5.1
+%global mozjs128_version 128.14.0
 
 Name:          cjs
 Epoch:         1
-Version:       128.1%{!?tag:~%{date}git%{shortcommit0}}
-Release:       2%{?dist}
+Version:       128.1
+Release:       5%{?dist}
 Summary:       Javascript Bindings for Cinnamon
 
 # Automatically converted from old format: MIT and (MPLv1.1 or GPLv2+ or LGPLv2+) - review is highly recommended.
@@ -21,11 +16,8 @@ License:       LicenseRef-Callaway-MIT AND (LicenseRef-Callaway-MPLv1.1 OR GPL-2
 # The console module (modules/console.c)
 # Stack printer (gjs/stack.c)
 URL:           https://github.com/linuxmint/%{name}
-%if 0%{?tag:1}
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-%else
-Source0:        %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
-%endif
+Source0:       %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:        pkconfig.patch
 
 ExcludeArch:   %{ix86}
 
@@ -78,22 +70,15 @@ the functionality of the installed cjs package.
 
 
 %prep
-%if 0%{?tag:1}
 %autosetup -p1
-%else
-%autosetup -p1 -n %{name}-%{commit0}
-%endif
-
 
 %build
 %meson
 %meson_build
 
-
 %install
 %meson_install
 
-
 %check
 %{shrink:xwfb-run -c mutter -- %meson_test --timeout-multiplier=5}
 
@@ -121,8 +106,17 @@ the functionality of the installed cjs package.
 
 
 %changelog
-* Fri Apr 03 2026 Leigh Scott <leigh123linux@gmail.com> - 1:128.1-2
-- Rebuild for aarch64 symbol issue
+* Mon Jun 01 2026 Leigh Scott <leigh123linux@gmail.com> - 1:128.1-5
+- Rebuild for mozjs128-128.14.0
+
+* Wed Jan 21 2026 Leigh Scott <leigh123linux@gmail.com> - 1:128.1-4
+- Add pkgconfig variable to export the appropriate API version of mozjs
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:128.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:128.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 
 * Wed Dec 10 2025 Leigh Scott <leigh123linux@gmail.com> - 1:128.1-1
 - Update to 128.1

diff --git a/pkconfig.patch b/pkconfig.patch
new file mode 100644
index 0000000..90f2f7d
--- /dev/null
+++ b/pkconfig.patch
@@ -0,0 +1,11 @@
+diff -uNrp a/meson.build b/meson.build
+--- a/meson.build	2025-12-10 15:40:57.000000000 +0000
++++ b/meson.build	2026-01-21 10:42:13.388115407 +0000
+@@ -600,6 +600,7 @@ pkg.generate(libcjs, name: api_name, des
+         'exec_prefix=${prefix}',
+         'datarootdir=${datadir}',
+         'cjs_console=${bindir}/cjs-console',
++        'mozjs_dep_name=@0@'.format(spidermonkey.name()),
+     ])
+ 
+ ### Test environment ###########################################################