diff --git a/.gitignore b/.gitignore index a7236f2..76019c0 100644 --- a/.gitignore +++ b/.gitignore @@ -312,3 +312,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-0.9.10.1.20150109git.ce3b386.tar.bz2 /NetworkManager-0.9.10.1.20150115git.ea40551.tar.bz2 /NetworkManager-0.9.10.1.20150115git.76c00cf.tar.bz2 +/NetworkManager-0.9.10.1.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 6d02a6b..a64db82 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -10,10 +10,10 @@ %define ppp_version 2.4.7 %endif -%define snapshot .20150115git -%define git_sha 76c00cf +#define snapshot .20150115git +#define git_sha 76c00cf %define realversion 0.9.10.1 -%define release_version 1.4 +%define release_version 2 %define epoch_version 1 %define obsoletes_nmver 1:0.9.9.95-1 @@ -61,18 +61,18 @@ %global _hardened_build 1 -%define git_sha_version %(test -n '%{git_sha}' && echo '.%{git_sha}') +%define git_sha_version %{?git_sha:.%{git_sha}} Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{realversion} -Release: %{release_version}%{snapshot}%{?dist} +Release: %{release_version}%{?snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{realversion}%{snapshot}%{git_sha_version}.tar.bz2 +Source0: https://download.gnome.org/sources/%{name}/0.9/%{name}-%{realversion}%{?snapshot}%{git_sha_version}.tar.xz Source1: NetworkManager.conf Source2: 00-server.conf Source3: 20-connectivity-fedora.conf @@ -592,6 +592,9 @@ fi %endif %changelog +* Fri Jan 23 2015 Lubomir Rintel - 1:0.9.10.1-2 +- Update to 0.9.10.1, a 0.9.10.2 release candidate 1 tarball + * Thu Jan 15 2015 Jiří Klimeš - 1:0.9.10.1-1.4.20150115git - connectivity: fix an connectivity check endless loop (bgo #742823) diff --git a/sources b/sources index 9d30387..0b18b10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ea0a3256ac0b7d8b05a4da8995de36a NetworkManager-0.9.10.1.20150115git.76c00cf.tar.bz2 +43180aa197707ea87987f862465d4492 NetworkManager-0.9.10.1.tar.xz