diff --git a/libnma-1.8.32.tar.xz b/libnma-1.8.32.tar.xz deleted file mode 100644 index d1514b0..0000000 Binary files a/libnma-1.8.32.tar.xz and /dev/null differ diff --git a/libnma-1.8.38.tar.xz b/libnma-1.8.38.tar.xz new file mode 100644 index 0000000..874d6a4 Binary files /dev/null and b/libnma-1.8.38.tar.xz differ diff --git a/libnma.spec b/libnma.spec index 66300b2..34ed8a0 100644 --- a/libnma.spec +++ b/libnma.spec @@ -1,29 +1,29 @@ %global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad) +%global gtk4_version %(pkg-config --modversion gtk4 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global nm_version 1:1.8.0 %global mbp_version 0.20090602 -%global old_libnma_version 1.8.30 -%global rpm_version 1.8.32 -%global real_version 1.8.32 -%global release_version 2 -%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') +%global old_libnma_version 1.8.32 Name: libnma Summary: NetworkManager GUI library -Version: %{rpm_version} -Release: %{release_version} +Version: 1.8.38 +Release: 1 License: GPLv2+ and LGPLv2+ URL: https://gitlab.gnome.org/GNOME/libnma/ -Source0: https://download.gnome.org/sources/libnma/%{real_version_major}/%{name}-%{real_version}.tar.xz +Source0: https://download.gnome.org/sources/libnma/1.8/%{name}-%{version}.tar.xz + Patch1: 0001-nm-applet-no-notifications.patch -Obsoletes: libnma < %{old_libnma_version} +Requires: mobile-broadband-provider-info >= %{mbp_version} +Conflicts: libnma < %{old_libnma_version} BuildRequires: gcc gettext-devel pkgconfig meson gtk-doc iso-codes-devel gcr-devel -BuildRequires: NetworkManager-libnm-devel >= %{nm_version} gtk3-devel >= 3.10 -BuildRequires: ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 +BuildRequires: NetworkManager-libnm-devel >= %{nm_version} gtk3-devel >= 3.12 +BuildRequires: ModemManager-glib-devel >= 1.0 glib2-devel >= 2.38 BuildRequires: gobject-introspection-devel >= 0.10.3 pkgconfig BuildRequires: mobile-broadband-provider-info-devel >= %{mbp_version} +BuildRequires: gtk4-devel >= 4.0 %description This package contains the library used for integrating GUI tools with @@ -33,23 +33,26 @@ NetworkManager. Summary: Header files for NetworkManager GUI library Requires: NetworkManager-libnm-devel >= %{nm_version} Obsoletes: NetworkManager-gtk-devel < 1:0.9.7 -Requires: libnma = %{version}-%{release} pkgconfig gtk3-devel -Obsoletes: libnma < %{old_libnma_version} +Requires: libnma%{?_isa} = %{version}-%{release} +Requires: gtk3-devel%{?_isa} +Requires: pkgconfig +Requires: gtk4%{?_isa} >= %{gtk4_version} +Requires: gtk4-devel%{?_isa} +Requires: mobile-broadband-provider-info >= %{mbp_version} +Conflicts: libnma < %{old_libnma_version} %description devel This package contains header and pkg-config files to be used for integrating GUI tools with NetworkManager. %prep -%autosetup -p1 -n "%{name}-%{real_version}" +%autosetup -p1 -n "%{name}-%{version}" %build -%configure --disable-mobile-broadband-provider-info %meson \ -Dgcr=true \ - -Ddisable-static=true \ -Dvapi=false \ - -Dlibnma_gtk4=false \ + -Dlibnma_gtk4=true \ -Dmobile_broadband_provider_info=false %meson_build @@ -65,18 +68,26 @@ GUI tools with NetworkManager. %doc NEWS CONTRIBUTING %license COPYING %{_libdir}/libnma.so.* +%{_libdir}/libnma-gtk4.so.* %{_libdir}/girepository-1.0/NMA-1.0.typelib +%{_libdir}/girepository-1.0/NMA4-1.0.typelib %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %files devel %defattr(-,root,root) %{_includedir}/libnma %{_libdir}/pkgconfig/libnma.pc +%{_libdir}/pkgconfig/libnma-gtk4.pc %{_libdir}/libnma.so +%{_libdir}/libnma-gtk4.so %{_datadir}/gir-1.0/NMA-1.0.gir +%{_datadir}/gir-1.0/NMA4-1.0.gir %{_datadir}/gtk-doc %changelog +* Wed Nov 02 2022 wangkai - 1.8.38-1 +- Update to 1.8.38 + * Tue Oct 25 2022 wangkerong - 1.8.32-2 - rebuild for next release diff --git a/libnma.yaml b/libnma.yaml new file mode 100644 index 0000000..97c06ab --- /dev/null +++ b/libnma.yaml @@ -0,0 +1,4 @@ +version_control: gitlab.gnome +src_repo: libnma +tag_prefix: ^ +separator: .