rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update spec file with upstream's contrib/rpm

Browse Source
This commit is contained in:
Thomas Haller 2016-08-11 15:50:24 +02:00
parent 0eea3092fc
commit 26675d15eb
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-wifi-on-resume-rh1362165.patch
View File

@ -1,4 +1,4 @@
From 3cd610adaba13c882881457520722fb201062ce7 Mon Sep 17 00:00:00 2001 From 3a4ad2c4cfc3daebf64bd5469a5b127a06611d26 Mon Sep 17 00:00:00 2001
From: Tony Espy <espy@canonical.com> From: Tony Espy <espy@canonical.com>
Date: Thu, 16 Jun 2016 15:07:33 -0400 Date: Thu, 16 Jun 2016 15:07:33 -0400
Subject: [PATCH 1/2] wifi: clear WiFi requested_scan if suppl exits Subject: [PATCH 1/2] wifi: clear WiFi requested_scan if suppl exits
@ -33,7 +33,7 @@ index a88d6eb..8220776 100644
2.7.4 2.7.4
From eeb1532754cc0022a97732c989da2e09aa95a9b6 Mon Sep 17 00:00:00 2001 From ba216887c6c213aed9d37e4125c73604ef10c9da Mon Sep 17 00:00:00 2001
From: Tony Espy <espy@canonical.com> From: Tony Espy <espy@canonical.com>
Date: Thu, 16 Jun 2016 15:07:32 -0400 Date: Thu, 16 Jun 2016 15:07:32 -0400
Subject: [PATCH 2/2] wifi: clear WiFi requested_scan if suppl goes INACTIVE Subject: [PATCH 2/2] wifi: clear WiFi requested_scan if suppl goes INACTIVE

10
NetworkManager.spec
View File

@ -5,7 +5,7 @@
%global wireless_tools_version 1:28-0pre9 %global wireless_tools_version 1:28-0pre9
%global libnl3_version 3.2.7 %global libnl3_version 3.2.7
%global ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
%global snapshot git20160621 %global snapshot git20160621
%global git_sha 072358da %global git_sha 072358da
@ -69,11 +69,7 @@
%bcond_without wifi %bcond_without wifi
%bcond_without nmtui %bcond_without nmtui
%if (0%{?rhel} && 0%{?rhel} <= 7)
%bcond_with regen_docs
%else
%bcond_without regen_docs %bcond_without regen_docs
%endif
%bcond_with debug %bcond_with debug
%bcond_without test %bcond_without test
@ -152,7 +148,7 @@ BuildRequires: gtk-doc
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143 BuildRequires: libgudev1-devel >= 143
BuildRequires: vala-tools >= 0.26.1 BuildRequires: vala-tools
BuildRequires: iptables BuildRequires: iptables
%if %{with bluetooth} %if %{with bluetooth}
BuildRequires: bluez-libs-devel BuildRequires: bluez-libs-devel
@ -346,9 +342,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%patch1 -p1 %patch1 -p1
%build %build
%if %{with regen_docs}
gtkdocize gtkdocize
%endif
autoreconf --install --force autoreconf --install --force
intltoolize --automake --copy --force intltoolize --automake --copy --force
%configure \ %configure \