license: fix license tags

Bug-Url: svinota#347

Author: svinota

Makefile

@@ -1,20 +1,8 @@
-# 	Copyright (c) 2013-2016 Peter V. Saveliev
-#
-# 	This file is part of pyroute2 project.
+##
 #
-# 	Pyroute2 is free software; you can redistribute it and/or modify
-# 	it under the terms of the GNU General Public License as published by
-# 	the Free Software Foundation; either version 2 of the License, or
-# 	(at your option) any later version.
+#   The pyroute2 project is dual licensed, see README.license.md for details
 #
-# 	Pyroute2 is distributed in the hope that it will be useful,
-# 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-# 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 	GNU General Public License for more details.
 #
-# 	You should have received a copy of the GNU General Public License
-# 	along with Pyroute2; if not, write to the Free Software
-# 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 ##
 # Pyroute version and release

packages/RedHat/python-pyroute2.spec

@@ -7,7 +7,7 @@ Name: python-%{srcname}
 Version: 0.4.13
 Release: 1%{?dist}
 Summary: %{sum}
-License: GPLv2+
+License: GPLv2+ or Apache-2.0
 Group: Development/Languages
 URL: https://github.com/svinota/%{srcname}
 
@@ -69,11 +69,6 @@ IPQ.
 - ipdb: #322 -- IPv6 updates on interfaces in DOWN state
 - rtnl: #284 -- support vlan_flags
 - ipdb: #307 -- fix IPv6 routes management
-<<<<<<< Updated upstream
-= ipdb: #311 -- vlan interfaces address loading
-- iprsocket: #305 -- support NETLINK_LISTEN_ALL_NSID
-
-=======
 - ipdb: #311 -- vlan interfaces address loading
 - iprsocket: #305 -- support NETLINK_LISTEN_ALL_NSID
 
@@ -83,7 +78,6 @@ IPQ.
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.4.10-2
 - Rebuild for Python 3.6
 
->>>>>>> Stashed changes
 * Fri Oct 14 2016 Peter V. Saveliev <peter@svinota.eu> 0.4.10-1
 - devlink fd leak fix