From 5e25c1bcbbbf714e8b815f91797888a39942fb86ebff5ac9bddf10f37880617a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Feb 2024 13:20:26 +0000 Subject: [PATCH] Accepting request 1146846 from GNOME:Next - Fix package names for v6, and obsolete old packages. OBS-URL: https://build.opensuse.org/request/show/1146846 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=445 --- webkit2gtk3.changes | 5 +++++ webkit2gtk3.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 344a99f..87b6281 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 15 04:03:27 UTC 2024 - Michael Gorse + +- Fix package names for v6, and obsolete old packages. + ------------------------------------------------------------------- Wed Feb 14 17:44:28 UTC 2024 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 104fa8e..90c084c 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -68,8 +68,8 @@ ExclusiveArch: do-not-build %define _jscver 6.0 %define _pkgconfig_suffix gtk-4.0 %define _usesoup2 0 -%define _wk2sover6api 6_0-4 -%define _soverlj6api 6_0-1 +%define _wk2sover6api -6_0-4 +%define _soverlj6api -6_0-1 %endif Name: webkit2%{_gtknamesuffix} @@ -231,6 +231,7 @@ Requires: bubblewrap %if "%{flavor}" == "gtk4" Requires: libjavascriptcoregtk%{_soverlj6api} = %{version} Requires: webkitgtk-%{_sonameverpkg}-injected-bundles +Obsoletes: libwebkitgtk6_0-4 %else Requires: libjavascriptcoregtk%{_sover} = %{version} Requires: webkit2gtk-%{_sonameverpkg}-injected-bundles @@ -295,6 +296,7 @@ more. %package -n libjavascriptcoregtk%{_soverlj6api} Summary: JavaScript Core Engine, GTK+ Port Group: System/Libraries +Obsoletes: libjavascriptcoregtk6_0-1 %description -n libjavascriptcoregtk%{_soverlj6api} WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -433,8 +435,8 @@ Group: Development/Tools/Other A small test browswer from webkit, useful for testing features. -# Expand %%lang_package to Obsoletes its older-name counterpart +# Expand %%lang_package to Obsoletes its older-name counterpart %package -n WebKitGTK-%{_apiver}-lang Summary: Translations for package %{name} Group: System/Localization