From 26f9a5e4e46ef9d00bcd980b08f9d0eb4d64ddf2 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 2 Nov 2022 17:41:15 +0800 Subject: [PATCH] optimise spec file --- libnma.spec | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/libnma.spec b/libnma.spec index f991de8..286cc71 100644 --- a/libnma.spec +++ b/libnma.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %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) @@ -43,13 +43,20 @@ BuildRequires: mobile-broadband-provider-info-devel >= %{mbp_version} This package contains the library used for integrating GUI tools with NetworkManager. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. %package devel Summary: Header files for NetworkManager GUI library Requires: NetworkManager-libnm-devel >= %{nm_version} Obsoletes: NetworkManager-gtk-devel < 1:0.9.7 -Requires: libnma%{?_isa} = %{version}-%{release} -Requires: gtk3-devel%{?_isa} +Requires: libnma = %{version}-%{release} +Requires: gtk3-devel Requires: pkgconfig Conflicts: libnma < %{old_libnma_version} @@ -60,7 +67,7 @@ GUI tools with NetworkManager. %package gtk4 Summary: Experimental GTK 4 version of NetworkManager GUI library -Requires: gtk4%{?_isa} >= %{gtk4_version} +Requires: gtk4 >= %{gtk4_version} Requires: mobile-broadband-provider-info >= %{mbp_version} Conflicts: libnma < %{old_libnma_version} @@ -72,8 +79,8 @@ integrating GUI tools with NetworkManager. %package gtk4-devel Summary: Header files for experimental GTK4 version of NetworkManager GUI library Requires: NetworkManager-libnm-devel >= %{nm_version} -Requires: libnma-gtk4%{?_isa} = %{version}-%{release} -Requires: gtk4-devel%{?_isa} +Requires: libnma-gtk4 = %{version}-%{release} +Requires: gtk4-devel Requires: pkgconfig Conflicts: libnma < %{old_libnma_version} @@ -102,18 +109,22 @@ files to be used for integrating GUI tools with NetworkManager. %meson_install %find_lang %{name} +%generate_compatibility_deps %check %meson_test %files -f %{name}.lang +%dir %{abidir} %{_libdir}/libnma.so.* +%{abidir}/libnma.dump %{_libdir}/girepository-1.0/NMA-1.0.typelib %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml -%doc NEWS CONTRIBUTING %license COPYING +%files doc +%doc NEWS CONTRIBUTING %files devel %{_includedir}/libnma @@ -126,6 +137,7 @@ files to be used for integrating GUI tools with NetworkManager. %if %{with libnma_gtk4} %files gtk4 %{_libdir}/libnma-gtk4.so.* +%{abidir}/libnma-gtk4.dump %{_libdir}/girepository-1.0/NMA4-1.0.typelib %license COPYING @@ -139,6 +151,9 @@ files to be used for integrating GUI tools with NetworkManager. %changelog +* Wed Nov 02 2022 mgb01105731 - 1.8.36-2 +- optimise spec file & add doc package + * Mon Apr 18 2022 mgb01105731 - 1.8.36-1 - Init from upstream version 1.8.36 -- Gitee