From bb1f99d999f86c00d27456f20b22dd5b7e80273befc0fcbc8b8b3ecd9a81065a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 21 Jan 2022 14:48:22 +0000 Subject: [PATCH] Accepting request 947916 from GNOME:Next - Update to version 1.8.34: + Add possibility of building libnma-gtk4 library with experimental Gtk4 support. - Add pkgconfig(gtk4) BuildRequires and pass libnma_gtk4=true to meson, build the experimental Gtk4 support. - Following the above, package new sub-packages libnma-gtk4-0 and typelib-1_0-NMA4-1_0 and libnma-gtk4-devel. - Use ldconfig_scriptlets for post(un) handling. - Split out documentation files in own docs sub-package. OBS-URL: https://build.opensuse.org/request/show/947916 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libnma?expand=0&rev=16 --- libnma-1.8.32.tar.xz | 3 --- libnma-1.8.34.tar.xz | 3 +++ libnma.changes | 13 ++++++++++ libnma.spec | 62 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 70 insertions(+), 11 deletions(-) delete mode 100644 libnma-1.8.32.tar.xz create mode 100644 libnma-1.8.34.tar.xz diff --git a/libnma-1.8.32.tar.xz b/libnma-1.8.32.tar.xz deleted file mode 100644 index 1199f26..0000000 --- a/libnma-1.8.32.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a57b93a2fad43acc763f320dd3a7a93c429b0e3118dfa549d67824cddc4e905 -size 1368492 diff --git a/libnma-1.8.34.tar.xz b/libnma-1.8.34.tar.xz new file mode 100644 index 0000000..276c210 --- /dev/null +++ b/libnma-1.8.34.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304 +size 1342040 diff --git a/libnma.changes b/libnma.changes index afce072..cbb1ca5 100644 --- a/libnma.changes +++ b/libnma.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 19 21:40:45 UTC 2022 - Bjørn Lie + +- Update to version 1.8.34: + + Add possibility of building libnma-gtk4 library with + experimental Gtk4 support. +- Add pkgconfig(gtk4) BuildRequires and pass libnma_gtk4=true to + meson, build the experimental Gtk4 support. +- Following the above, package new sub-packages libnma-gtk4-0 and + typelib-1_0-NMA4-1_0 and libnma-gtk4-devel. +- Use ldconfig_scriptlets for post(un) handling. +- Split out documentation files in own docs sub-package. + ------------------------------------------------------------------- Fri Aug 20 16:17:42 UTC 2021 - Bjørn Lie diff --git a/libnma.spec b/libnma.spec index 341b98e..3d925c6 100644 --- a/libnma.spec +++ b/libnma.spec @@ -1,7 +1,7 @@ # # spec file for package libnma # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define base_ver 1.8 Name: libnma -Version: 1.8.32 +Version: 1.8.34 Release: 0 Summary: Shared library for NetworkManager-applet License: GPL-2.0-or-later @@ -35,7 +35,8 @@ BuildRequires: pkgconfig(gcr-3) >= 3.14 BuildRequires: pkgconfig(gio-2.0) >= 2.38 BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.6 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 +BuildRequires: pkgconfig(gtk4) >= 4.0 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libnm) >= 1.7 BuildRequires: pkgconfig(mobile-broadband-provider-info) @@ -58,12 +59,25 @@ Requires: mobile-broadband-provider-info %description -n %{name}%{sover} Shared library for NetworkManager-applet. +%package -n %{name}-gtk4-%{sover} +Summary: Shared library for NetworkManager-applet. Gtk4 version +Requires: mobile-broadband-provider-info + +%description -n %{name}-gtk4-%{sover} +Shared library for NetworkManager-applet. Gtk4 version. + %package -n typelib-1_0-NMA-1_0 Summary: Introspection bindings for %{name} %description -n typelib-1_0-NMA-1_0 Introspection bindings for %{name}. +%package -n typelib-1_0-NMA4-1_0 +Summary: Introspection bindings for %{name} + +%description -n typelib-1_0-NMA4-1_0 +Introspection bindings for %{name}. + %package devel Summary: Development Files for %{name} Requires: %{name}%{sover} = %{version} @@ -72,6 +86,22 @@ Requires: typelib-1_0-NMA-1_0 = %{version} %description devel Development Files for %{name}. +%package gtk4-devel +Summary: Development Files for %{name}-gtk4 +# Depend on main devel package for the shared header files. +Requires: %{name}-devel = %{version} +Requires: %{name}-gtk4-%{sover} = %{version} +Requires: typelib-1_0-NMA4-1_0 = %{version} + +%description gtk4-devel +Development Files for %{name}-gtk4. + +%package docs +Summary: Documentation files for %{name} + +%description docs +Documentation files for %{name}. + %lang_package %prep @@ -79,6 +109,7 @@ Development Files for %{name}. %build %meson \ + -D libnma_gtk4=true \ %{nil} %meson_build @@ -86,8 +117,8 @@ Development Files for %{name}. %meson_install %find_lang %{name} %{?no_lang_C} -%post -n %{name}%{sover} -p /sbin/ldconfig -%postun -n %{name}%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{name}%{sover} +%ldconfig_scriptlets -n %{name}-gtk4-%{sover} %files -n %{name}%{sover} %license COPYING @@ -95,18 +126,33 @@ Development Files for %{name}. %{_libdir}/%{name}.so.* %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +%files -n %{name}-gtk4-%{sover} +%{_libdir}/%{name}-gtk4.so.* + %files -n typelib-1_0-NMA-1_0 %{_libdir}/girepository-1.0/NMA-1.0.typelib +%files -n typelib-1_0-NMA4-1_0 +%{_libdir}/girepository-1.0/NMA4-1.0.typelib + %files devel -%doc %{_datadir}/gtk-doc/html/%{name}/ %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/gir-1.0/NMA-1.0.gir -%{_datadir}/vala/vapi/libnma.deps -%{_datadir}/vala/vapi/libnma.vapi +%{_datadir}/vala/vapi/%{name}.deps +%{_datadir}/vala/vapi/%{name}.vapi + +%files gtk4-devel +%{_libdir}/%{name}-gtk4.so +%{_libdir}/pkgconfig/%{name}-gtk4.pc +%{_datadir}/gir-1.0/NMA4-1.0.gir +%{_datadir}/vala/vapi/%{name}-gtk4.deps +%{_datadir}/vala/vapi/%{name}-gtk4.vapi + +%files docs +%doc %{_datadir}/gtk-doc/html/%{name}/ %files lang -f %{name}.lang