From 9b6a7107cdde2a5d1caf3a6b8e3257c43e6f322b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 17 Jan 2017 15:15:12 +0100 Subject: [PATCH] Fix up merge trouble --- NetworkManager.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 1889ac3..b1a0216 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -10,15 +10,9 @@ %global snapshot %{nil} %global git_sha %{nil} -<<<<<<< 0727cc1c28b90eb887b997b363941e0c709ed46b -%global rpm_version 1.5.3 -%global real_version 1.5.3 -%global release_version 5 -======= -%global rpm_version 1.5.90 +%global rpm_version 1.6 %global real_version 1.5.90 -%global release_version 1 ->>>>>>> Update to a 1.6-rc1 +%global release_version 0.1.rc1 %global epoch_version 1 %global obsoletes_device_plugins 1:0.9.9.95-1 @@ -101,7 +95,7 @@ Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: https://download.gnome.org/sources/NetworkManager/1.5/%{name}-%{version}%{snap}.tar.xz +Source: https://download.gnome.org/sources/NetworkManager/1.5/%{name}-%{real_version}%{snap}.tar.xz Source1: NetworkManager.conf Source2: 00-server.conf Source3: 20-connectivity-fedora.conf