diff --git a/.gitignore b/.gitignore index 1fe489b..66c686c 100644 --- a/.gitignore +++ b/.gitignore @@ -318,3 +318,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.0.3.git20150707.e3bd4e1.tar.bz2 /NetworkManager-1.0.4.git20150713.38bf2cb0.tar.bz2 /NetworkManager-1.0.4.tar.xz +/NetworkManager-1.0.6.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 341050e..8f6d10c 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,10 +7,9 @@ %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) -%define snapshot %{nil} -%define release_version 2 -%define git_sha %{nil} -%define realversion 1.0.4 +%define snapshot 20150813git7e2caa2 +%define release_version 0.1 +%define realversion 1.0.6 %define epoch_version 1 %define obsoletes_nmver 1:0.9.9.95-1 @@ -69,18 +68,16 @@ %global _hardened_build 1 -%define git_sha_version %(test -n '%{git_sha}' && echo '.%{git_sha}') - Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{realversion} -Release: %{release_version}%{snapshot}%{git_sha_version}%{?dist} +Release: %{release_version}%{?snapshot:.%{snapshot}}%{?dist} Group: System Environment/Base License: GPLv2+ 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 Source2: 00-server.conf Source3: 10-ibft-plugin.conf @@ -719,6 +716,9 @@ fi %endif %changelog +* Thu Aug 13 2015 Lubomir Rintel - 1:1.0.6-0.1.20150813git7e2caa2 +- Update to a Git snapshot + * Tue Jul 14 2015 Lubomir Rintel - 1:1.0.4-2 - Fix an assertion failure in nmcli (rh #1244048) - Fix default route handling on assumed connections (rh #1245648) diff --git a/sources b/sources index 3b348ea..d49facf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7eabef7bd3bbdd6dc0473dd32aeac924 NetworkManager-1.0.4.tar.xz +6954d9945797c35c1f41c825dec1ea6a NetworkManager-1.0.6.tar.xz