From 34a98b5cacefaca1edc919bf845c9e63f1ddc7e5 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Sat, 25 Jul 2020 17:07:41 +0800 Subject: [PATCH] update package --- network-manager-applet.spec | 110 +++++++++++++++++------------------- 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 9a5e80b..65e4f24 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -1,69 +1,67 @@ %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) -<<<<<<< HEAD %global nm_version 1:1.16.0 %global libnma_version 1.8.27 %global obsoletes_ver 1:0.9.7 - - + +%global rpm_version 1.18.0 %global real_version 1.18.0 - -%bcond_with libnm_gtk - -Name: network-manager-applet -Version: 1.18.0 -Release: 0 -Summary: NetworkManager GUI tools -License: GPLv2+ -URL: http://www.gnome.org/projects/NetworkManager -Source0: https://gitlab.gnome.org/GNOME/network-manager-applet/-/archive/%{version}/network-manager-applet-%{version}.tar.bz2 - - -Requires: NetworkManager libnotify -Requires: libnma = %{version}-%{release} -Requires: nm-connection-editor = %{version}-%{release} - -%if %{with libnm_gtk} -BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel +%global release_version 1 + +%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') + +%if 0%{?fedora} > 31 || 0%{?rhel} > 8 +%bcond_with libnma_gtk4 +%else +%bcond_without libnma_gtk4 %endif -BuildRequires: ModemManager-glib-devel NetworkManager-libnm-devel glib2-devel desktop-file-utils -BuildRequires: gettext-devel gobject-introspection-devel gtk-doc intltool meson gcr-devel gtk3-devel -BuildRequires: iso-codes-devel jansson-devel libgudev-devel libnotify-devel libsecret-devel libxslt -BuildRequires: libselinux-devel mobile-broadband-provider-info-devel pkgconfig /usr/bin/autopoint - - -%description -A network control and status applet for NetworkManager - -%package -n nm-connection-editor -Summary: A network connection configuration editor for NetworkManager - -%description -n nm-connection-editor -This package contains a network configuration editor and Bluetooth modem -utility for use with NetworkManager. - -%package -n libnm-gtk -Summary: Private libraries for %{name} -Requires: gtk3 >= %{gtk3_version} -Requires: mobile-broadband-provider-info >= 0.20090602 -Obsoletes: NetworkManager-gtk < 1:0.9.7 -%description -n libnm-gtk -This package contains private libraries to be used only by nm-applet, -nm-connection editor, and the GNOME Control Center. +Name: network-manager-applet +Summary: A network control and status applet for NetworkManager +Version: %{rpm_version} +Release: %{release_version}%{?dist} +License: GPLv2+ +URL: http://www.gnome.org/projects/NetworkManager/ +Obsoletes: NetworkManager-gnome < %{obsoletes_ver} -%package -n libnm-gtk-devel -Summary: Private header files for %{name} -Requires: NetworkManager-devel NetworkManager-glib-devel -Obsoletes: NetworkManager-gtk-devel < 1:0.9.7 -Requires: libnm-gtk = %{version}-%{release} -Requires: gtk3-devel pkgconfig +Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz -%description -n libnm-gtk-devel +Requires: NetworkManager >= %{nm_version} +Requires: libnotify >= 0.4.3 +Requires: nm-connection-editor%{?_isa} = %{version}-%{release} +Requires: libnma%{?_isa} >= %{libnma_version} + +BuildRequires: NetworkManager-libnm-devel >= %{nm_version} +BuildRequires: libnma-devel >= %{libnma_version} +BuildRequires: ModemManager-glib-devel >= 1.0 +BuildRequires: glib2-devel >= 2.32 +BuildRequires: gtk3-devel >= 3.10 +%if %{with libnma_gtk4} +BuildRequires: gtk4-devel >= 3.96 +%endif +BuildRequires: gobject-introspection-devel >= 0.10.3 +BuildRequires: gettext-devel +BuildRequires: /usr/bin/autopoint +BuildRequires: pkgconfig +BuildRequires: libnotify-devel >= 0.4 +BuildRequires: meson +BuildRequires: intltool +BuildRequires: gtk-doc +BuildRequires: desktop-file-utils +BuildRequires: iso-codes-devel +BuildRequires: libgudev1-devel >= 147 +BuildRequires: libsecret-devel >= 0.12 +BuildRequires: jansson-devel +BuildRequires: gcr-devel +BuildRequires: libselinux-devel +BuildRequires: mobile-broadband-provider-info-devel +BuildRequires: libappindicator-gtk3-devel +BuildRequires: libdbusmenu-gtk3-devel + +%description -n libnma-devel This package contains private header and pkg-config files to be used only by -GNOME control center.This package is obsoleted by libnma. +nm-applet, nm-connection-editor, and the GNOME control center. This package deprecates libnm-gtk. @@ -156,11 +154,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_mandir}/man1/nm-connection-editor* %changelog -<<<<<<< HEAD * Mon Jun 22 2020 Adam Williamson - 1.18.0-1 -======= -* Mon Jun 22 2020 Adam Williamson - 1.18.0-0 ->>>>>>> 19109fbb5c4965669031449ed4460cd6032ba9af - Update to 1.18.0 * Thu Nov 21 2019 openEuler Buildteam - 1.8.22-2