diff --git a/fix-dependency-pc-name.patch b/fix-dependency-pc-name.patch deleted file mode 100644 index a5b77b3..0000000 --- a/fix-dependency-pc-name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- orig-libnma-1.10.0/meson.build 2022-09-07 16:53:19.000000000 +0200 -+++ libnma-1.10.0/meson.build 2022-09-07 20:38:55.040696543 +0200 -@@ -277,7 +277,7 @@ - if enable_gcr_gtk4 - assert(enable_libnma_gtk4, 'gcr-gtk4 support was requested, but the libnma-gtk4 build was not enabled.') - -- gcr4_gtk4_deps = dependency('gcr-4-gtk4', version: '>= 3.90', required: false) -+ gcr4_gtk4_deps = dependency('gcr-4', version: '>= 3.90', required: false) - assert(cc.compiles(gcr_api_check_src, dependencies: gcr4_gtk4_deps), - 'gcr-gtk4 support was requested with -Dgcr_gtk4=true, but the gcr-gtk4 library is not available.') - diff --git a/libnma-1.10.2.tar.xz b/libnma-1.10.2.tar.xz deleted file mode 100644 index d4accd0..0000000 --- a/libnma-1.10.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fc3d9c404b7b13303d9394f96961c5298d71afa9f1fa7af5e4f0f6e842a0940 -size 1360128 diff --git a/libnma-1.10.4.tar.xz b/libnma-1.10.4.tar.xz new file mode 100644 index 0000000..ceee989 --- /dev/null +++ b/libnma-1.10.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79e730dda19f9b34886f4064aa170f1a2326b08329d655d80b67e906c7f78b7c +size 1351932 diff --git a/libnma.changes b/libnma.changes index fb23c27..e512404 100644 --- a/libnma.changes +++ b/libnma.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Nov 8 16:21:07 UTC 2022 - Dominique Leuenberger + +- Update to version 1.10.4: + + Split org.gnome.nm-applet.eap GSchema from org.gnome.nm-applet, + so that the latter can be provided by network-manager-applet + again (where it belongs). + + build: unbreak build with gcr-3.92. +- split out schema file from the library package: adhere to the + shared library policy. The library requires the new + libnma-glib-schema package. +- Drop fix-dependency-pc-name.patch: fixed upstream. + ------------------------------------------------------------------- Fri Sep 9 14:27:01 UTC 2022 - Bjørn Lie diff --git a/libnma.spec b/libnma.spec index f79c599..6aca8e0 100644 --- a/libnma.spec +++ b/libnma.spec @@ -20,14 +20,12 @@ %define base_ver 1.10 Name: libnma -Version: 1.10.2 +Version: 1.10.4 Release: 0 Summary: Shared library for NetworkManager-applet License: GPL-2.0-or-later URL: https://gitlab.gnome.org/GNOME/libnma Source0: https://download.gnome.org/sources/%{name}/%{base_ver}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM fix-dependency-pc-name.patch -- Update .pc name to new form -Patch0: fix-dependency-pc-name.patch BuildRequires: gtk-doc BuildRequires: meson @@ -58,11 +56,20 @@ Obsoletes: nma-data < %{version} Provides: nma-data = %{version} Obsoletes: libnma-data < %{version} Provides: libnma-data = %{version} +Requires: %{name}-glib-schema >= %{version} Requires: mobile-broadband-provider-info %description -n %{name}%{sover} Shared library for NetworkManager-applet. +%package glib-schema +Summary: glib-schema org.gnome.nm-applet.eap + +%description glib-schema +The glib-schema allows libnma to be configured wia dconf + +It is required by libnma + %package -n %{name}-gtk4-%{sover} Summary: Shared library for NetworkManager-applet. Gtk4 version Requires: mobile-broadband-provider-info @@ -116,13 +123,15 @@ Documentation files for %{name}. %meson \ -D b_lto=true \ -D libnma_gtk4=true \ - -D gcr_gtk4=true \ + -D gcr=true \ %{nil} %meson_build %install %meson_install %find_lang %{name} %{?no_lang_C} +# this file lives in NetworkManager-applet since 1.30.0 +rm %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %ldconfig_scriptlets -n %{name}%{sover} %ldconfig_scriptlets -n %{name}-gtk4-%{sover} @@ -131,7 +140,9 @@ Documentation files for %{name}. %license COPYING %doc NEWS %{_libdir}/%{name}.so.* -%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml + +%files glib-schema +%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.eap.gschema.xml %files -n %{name}-gtk4-%{sover} %{_libdir}/%{name}-gtk4.so.*