Accepting request 1362616 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/1362616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cjs?expand=0&rev=24

cjs.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue May 12 11:58:59 UTC 2026 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 140.0:
+  + Enabling various clang-tidy checks
+  + Various maintenance
+  + Error when importing Gio after manipulating Object.prototype
+  + Investigate union fields being garbage collected
+  + Follow-up from "Gtk: Builder constructor overrides in GTK4"
+  + Tweaks to examples
+- For other changes please see upstream git
+  https://github.com/linuxmint/cjs/tags
+- Replace pkgconfig(mozjs-115) with pkgconfig(mozjs-140)
+  BuildRequires:following upstreams port.
+- Fold GjsPrivate-1.0.typelib into main cjs package, its a private
+  one, and since it was renamed from CjsPrivate-1.0.typelib, having
+  it as a own subpackage is impossible as gjs already produces one
+  with that name. Following this, add a Conflicts on gjs, as these
+  packages are now not possible to install at the same time.
+- Stop passing --libexecdir=%{_libdir}/%{name}/ to meson setup, we
+  have a proper libexecdir in distro now.
+- Stop passing obsolete and no longer recognized cairo=enabled to
+  meson setup, and also drop explicit readline=enabled and
+  profiler=enabled, we are using the upstream default here.
+- Split out new cjs-tests subpackage, and add global
+  __requires_exclude typelib for non-existent typelibs.
+
 -------------------------------------------------------------------
 Wed Nov 27 09:06:48 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
 

cjs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cjs
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,10 @@
 
 
 %define         sover   0
-%define         typelib typelib-1_0-CjsPrivate-1_0
+%global __requires_exclude typelib\\(GIMarshallingTests!|GIMarshallingTests)|Gio!|Gio)|Regress!|Regress)|WarnLib!|WarnLib)\\)
+
 Name:           cjs
-Version:        6.4.0
+Version:        140.0
 Release:        0
 Summary:        JavaScript module used by Cinnamon
 License:        (GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later) AND MIT
@@ -37,7 +38,7 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(mozjs-115)
+BuildRequires:  pkgconfig(mozjs-140)
 %if 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(readline)
 %else
@@ -45,6 +46,7 @@ BuildRequires:  readline-devel
 %endif
 BuildRequires:  pkgconfig(sysprof-6)
 BuildRequires:  pkgconfig(sysprof-capture-4)
+Conflicts:      gjs
 
 %description
 JavaScript bindings based on GObject Introspection for the
@@ -59,21 +61,10 @@ Cinnamon Desktop.
 
 This package provides libraries for cjs.
 
-%package -n typelib-1_0-CjsPrivate-1_0
-Summary:        Cinnamon JS module -- Introspection Bindings
-
-%description -n typelib-1_0-CjsPrivate-1_0
-JavaScript bindings based on GObject Introspection for the
-Cinnamon Desktop.
-
-This package provides the GObject Introspection bindings for
-Cinnamon JS.
-
 %package devel
 Summary:        Development Files for Cinnamon JS module
 Requires:       %{name} = %{version}
 Requires:       lib%{name}%{sover} = %{version}
-Requires:       typelib-1_0-CjsPrivate-1_0 = %{version}
 
 %description devel
 JavaScript bindings based on GObject Introspection for the
@@ -81,20 +72,24 @@ Cinnamon Desktop.
 
 This package contains development files for cjs.
 
+%package tests
+Summary:        Tests for the cjs package
+Requires:       %{name} = %{version}
+
+%description tests
+The cjs-tests package contains tests that can be used to verify
+the functionality of the installed cjs package.
+
 %prep
 %autosetup
 
 %build
-%meson \
-  -Dcairo=enabled \
-  -Dreadline=enabled \
-  -Dprofiler=enabled \
-  --libexecdir=%{_libdir}/%{name}/
+%meson
 %meson_build
 
 %install
 %meson_install
-%fdupes -s %{buildroot}
+%fdupes -s %{buildroot}%{_prefix}
 
 %ldconfig_scriptlets -n lib%{name}%{sover}
 
@@ -102,19 +97,22 @@ This package contains development files for cjs.
 %license COPYING
 %doc README.md NEWS
 %{_bindir}/%{name}*
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/girepository-1.0
+%{_libdir}/%{name}/girepository-1.0/GjsPrivate-1.0.typelib
 
 %files -n lib%{name}%{sover}
 %{_libdir}/libcjs.so.%{sover}*
 
-%files -n typelib-1_0-CjsPrivate-1_0
-%dir %{_libdir}/%{name}/
-%dir %{_libdir}/%{name}/girepository-1.0/
-%{_libdir}/%{name}/girepository-1.0/CjsPrivate-1.0.typelib
-
 %files devel
 %{_includedir}/%{name}-1.0/
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}*.pc
 %{_datadir}/%{name}-1.0/
 
+%files tests
+%{_libexecdir}/installed-tests/
+%{_datadir}/installed-tests/
+%{_datadir}/glib-2.0/schemas/org.cinnamon.CjsTest.gschema.xml
+
 %changelog

cjs-140.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c791d6e4741d799b56b5b7f5796d65f499754090976b54d05e0fc867bd63ecc6
+size 1090366

cjs-6.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
-size 874506