From 84dd345532ac87424b33a62a31d602e36bc87af8 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 24 Mar 2017 15:44:28 +0100 Subject: [PATCH] Update to a snapshot of network-manager-applet 1.8 release --- .gitignore | 1 + network-manager-applet.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8850bc8..fcb9fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /network-manager-applet-1.4.0.tar.xz /network-manager-applet-1.4.4.tar.xz /network-manager-applet-1.4.6.tar.xz +/network-manager-applet-1.7.1.tar.xz diff --git a/network-manager-applet.spec b/network-manager-applet.spec index e741761..d2563d7 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -1,18 +1,18 @@ -%global gtk3_version 3.0.1 -%global glib2_version 2.32.0 +%global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad) +%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global nm_version 1:1.1.0 %global obsoletes_ver 1:0.9.7 Name: network-manager-applet Summary: A network control and status applet for NetworkManager -Version: 1.4.6 -Release: 1%{?dist} +Version: 1.8.0 +Release: 0.1%{?dist} Group: Applications/System License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} -Source: https://download.gnome.org/sources/network-manager-applet/1.4/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/network-manager-applet/1.7/%{name}-1.7.1.tar.xz Patch0: nm-applet-no-notifications.patch Requires: NetworkManager >= %{nm_version} @@ -25,8 +25,8 @@ BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: NetworkManager-libnm-devel >= %{nm_version} BuildRequires: ModemManager-glib-devel >= 1.0 -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: glib2-devel >= 2.32 +BuildRequires: gtk3-devel >= 3.10 BuildRequires: libsecret-devel BuildRequires: gobject-introspection-devel >= 0.10.3 BuildRequires: gettext-devel @@ -39,6 +39,8 @@ BuildRequires: iso-codes-devel BuildRequires: libgudev1-devel >= 147 BuildRequires: libsecret-devel >= 0.12 BuildRequires: jansson-devel +BuildRequires: gcr-devel +BuildRequires: libselinux-devel %description This package contains a network control and status notification area applet @@ -110,13 +112,15 @@ nm-applet, nm-connection-editor, and the GNOME control center. This package deprecates libnm-gtk. %prep -%setup -q +%setup -q -n network-manager-applet-1.7.1 %patch0 -p1 %build autoreconf -i -f intltoolize --force %configure \ + --with-gcr \ + --with-selinux \ --disable-static \ --enable-more-warnings=yes make %{?_smp_mflags} @@ -222,6 +226,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Mar 24 2017 Lubomir Rintel - 1.8.0-0.1 +- Update to a snapshot of network-manager-applet 1.8 release + * Mon Mar 06 2017 Lubomir Rintel - 1.4.6-1 - Update to network-manager-applet 1.4.6 release diff --git a/sources b/sources index 5d7194f..b888a88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-manager-applet-1.4.6.tar.xz) = f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f +SHA512 (network-manager-applet-1.7.1.tar.xz) = d4b0cd5dcb219c34abf9c4f4df0861e3198c45edbb1e8d45eb53fe85fc590dd0486eb978c4445430554c70f337bb9e8fa9367c5c1689228ecc2c30194e8d7ff0