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

Fix up merge trouble

Browse Source
This commit is contained in:
Lubomir Rintel 2017-01-17 15:15:12 +01:00
parent f6516fc10b
commit 9b6a7107cd
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NetworkManager.spec
View File

@ -10,15 +10,9 @@
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
<<<<<<< 0727cc1c28b90eb887b997b363941e0c709ed46b %global rpm_version 1.6
%global rpm_version 1.5.3
%global real_version 1.5.3
%global release_version 5
=======
%global rpm_version 1.5.90
%global real_version 1.5.90 %global real_version 1.5.90
%global release_version 1 %global release_version 0.1.rc1
>>>>>>> Update to a 1.6-rc1
%global epoch_version 1 %global epoch_version 1
%global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_device_plugins 1:0.9.9.95-1
@ -101,7 +95,7 @@ Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ 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 Source1: NetworkManager.conf
Source2: 00-server.conf Source2: 00-server.conf
Source3: 20-connectivity-fedora.conf Source3: 20-connectivity-fedora.conf