Merge branch 'master' into f22

This commit is contained in:
Lubomir Rintel 2015-08-13 17:11:55 +02:00
commit 5cf28a408a
3 changed files with 10 additions and 9 deletions

1
.gitignore vendored
View File

@ -318,3 +318,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.0.3.git20150707.e3bd4e1.tar.bz2 /NetworkManager-1.0.3.git20150707.e3bd4e1.tar.bz2
/NetworkManager-1.0.4.git20150713.38bf2cb0.tar.bz2 /NetworkManager-1.0.4.git20150713.38bf2cb0.tar.bz2
/NetworkManager-1.0.4.tar.xz /NetworkManager-1.0.4.tar.xz
/NetworkManager-1.0.6.tar.xz

View File

@ -7,10 +7,9 @@
%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
%define snapshot %{nil} %define snapshot 20150813git7e2caa2
%define release_version 2 %define release_version 0.1
%define git_sha %{nil} %define realversion 1.0.6
%define realversion 1.0.4
%define epoch_version 1 %define epoch_version 1
%define obsoletes_nmver 1:0.9.9.95-1 %define obsoletes_nmver 1:0.9.9.95-1
@ -69,18 +68,16 @@
%global _hardened_build 1 %global _hardened_build 1
%define git_sha_version %(test -n '%{git_sha}' && echo '.%{git_sha}')
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: %{epoch_version} Epoch: %{epoch_version}
Version: %{realversion} Version: %{realversion}
Release: %{release_version}%{snapshot}%{git_sha_version}%{?dist} Release: %{release_version}%{?snapshot:.%{snapshot}}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{realversion}%{snapshot}%{git_sha_version}.tar.xz Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/%{name}-%{realversion}.tar.xz
Source1: NetworkManager.conf Source1: NetworkManager.conf
Source2: 00-server.conf Source2: 00-server.conf
Source3: 10-ibft-plugin.conf Source3: 10-ibft-plugin.conf
@ -719,6 +716,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 13 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-0.1.20150813git7e2caa2
- Update to a Git snapshot
* Tue Jul 14 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.4-2 * Tue Jul 14 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.4-2
- Fix an assertion failure in nmcli (rh #1244048) - Fix an assertion failure in nmcli (rh #1244048)
- Fix default route handling on assumed connections (rh #1245648) - Fix default route handling on assumed connections (rh #1245648)

View File

@ -1 +1 @@
7eabef7bd3bbdd6dc0473dd32aeac924 NetworkManager-1.0.4.tar.xz 6954d9945797c35c1f41c825dec1ea6a NetworkManager-1.0.6.tar.xz