[openstack-neutron/el6-icehouse] Moved all plugin sources to python-neutron to avoid breaking hidden upstream dependencies from agent

[Ihar Hrachyshka]

commit 47e6dd5b2d1737195755117cccd904f2cbee752b
Author: Miguel Angel Ajo <mangelajo at redhat.com>
Date:   Tue Jul 15 19:15:46 2014 +0200

    Moved all plugin sources to python-neutron to avoid breaking
    hidden upstream dependencies from agents to plugins, etc.
    fixes rhbz#1119619
    
    Removed the hyper-v agent exclude. Added a few LICENSE files
    to packages that missed it.

 openstack-neutron.spec |   49 ++++++++++-------------------------------------
 1 files changed, 11 insertions(+), 38 deletions(-)
---
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 6db28c9..e0a2c0b 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -873,25 +873,6 @@ fi
 %doc README.rst
 %{python_sitelib}/neutron
 %{python_sitelib}/quantum
-%exclude %{python_sitelib}/neutron/plugins/bigswitch
-%exclude %{python_sitelib}/neutron/plugins/brocade
-%exclude %{python_sitelib}/neutron/plugins/cisco
-%exclude %{python_sitelib}/neutron/plugins/hyperv
-%exclude %{python_sitelib}/neutron/plugins/ibm
-%exclude %{python_sitelib}/neutron/plugins/linuxbridge
-%exclude %{python_sitelib}/neutron/plugins/metaplugin
-%exclude %{python_sitelib}/neutron/plugins/midonet
-%exclude %{python_sitelib}/neutron/plugins/ml2
-%exclude %{python_sitelib}/neutron/plugins/mlnx
-%exclude %{python_sitelib}/neutron/plugins/nuage
-%exclude %{python_sitelib}/neutron/plugins/nec
-%exclude %{python_sitelib}/neutron/plugins/nicira
-%exclude %{python_sitelib}/neutron/plugins/ofagent
-%exclude %{python_sitelib}/neutron/plugins/oneconvergence
-%exclude %{python_sitelib}/neutron/plugins/openvswitch
-%exclude %{python_sitelib}/neutron/plugins/plumgrid
-%exclude %{python_sitelib}/neutron/plugins/ryu
-%exclude %{python_sitelib}/neutron/plugins/vmware
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
 
@@ -899,7 +880,6 @@ fi
 %doc LICENSE
 %doc neutron/plugins/bigswitch/README
 %{_bindir}/neutron-restproxy-agent
-%{python_sitelib}/neutron/plugins/bigswitch
 %dir %{_sysconfdir}/neutron/plugins/bigswitch
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
 %doc %{_sysconfdir}/neutron/plugins/bigswitch/README
@@ -908,7 +888,6 @@ fi
 %files brocade
 %doc LICENSE
 %doc neutron/plugins/brocade/README.md
-%{python_sitelib}/neutron/plugins/brocade
 %dir %{_sysconfdir}/neutron/plugins/brocade
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/brocade/*.ini
 
@@ -916,7 +895,6 @@ fi
 %files cisco
 %doc LICENSE
 %doc neutron/plugins/cisco/README
-%{python_sitelib}/neutron/plugins/cisco
 %dir %{_sysconfdir}/neutron/plugins/cisco
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/cisco/*.ini
 
@@ -926,9 +904,7 @@ fi
 #%%doc neutron/plugins/hyperv/README
 %{_bindir}/neutron-hyperv-agent
 %{_bindir}/quantum-hyperv-agent
-%{python_sitelib}/neutron/plugins/hyperv
 %dir %{_sysconfdir}/neutron/plugins/hyperv
-%exclude %{python_sitelib}/neutron/plugins/hyperv/agent
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/hyperv/*.ini
 
 
@@ -937,7 +913,6 @@ fi
 %{_bindir}/neutron-ibm-agent
 %{_bindir}/quantum-ibm-agent
 %doc neutron/plugins/ibm/README
-%{python_sitelib}/neutron/plugins/ibm
 %dir %{_sysconfdir}/neutron/plugins/ibm
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ibm/*.ini
 
@@ -949,7 +924,6 @@ fi
 %{_bindir}/quantum-linuxbridge-agent
 %{_initrddir}/neutron-linuxbridge-agent
 %{_datadir}/neutron/neutron-linuxbridge-agent.upstart
-%{python_sitelib}/neutron/plugins/linuxbridge
 %{_datarootdir}/neutron/rootwrap/linuxbridge-plugin.filters
 %dir %{_sysconfdir}/neutron/plugins/linuxbridge
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/linuxbridge/*.ini
@@ -958,23 +932,22 @@ fi
 %files midonet
 %doc LICENSE
 #%%doc neutron/plugins/midonet/README
-%{python_sitelib}/neutron/plugins/midonet
 %dir %{_sysconfdir}/neutron/plugins/midonet
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/midonet/*.ini
 
 
 %files ml2
+%doc LICENSE
 %doc neutron/plugins/ml2/README
-%{python_sitelib}/neutron/plugins/ml2
 %dir %{_sysconfdir}/neutron/plugins/ml2
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ml2/*.ini
 
 
 %files mellanox
+%doc LICENSE
 %doc neutron/plugins/mlnx/README
 %{_bindir}/neutron-mlnx-agent
 %{_bindir}/quantum-mlnx-agent
-%{python_sitelib}/neutron/plugins/mlnx
 %{_initrddir}/neutron-mlnx-agent
 %{_datadir}/neutron/neutron-mlnx-agent.upstart
 %dir %{_sysconfdir}/neutron/plugins/mlnx
@@ -987,9 +960,9 @@ fi
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nuage/*.ini
 
 %files ofagent
+%doc LICENSE
 %doc neutron/plugins/ofagent/README
 %{_bindir}/neutron-ofagent-agent
-%{python_sitelib}/neutron/plugins/ofagent
 
 
 %files oneconvergence-nvsd
@@ -999,7 +972,6 @@ fi
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/oneconvergence/nvsdplugin.ini
 %{_bindir}/neutron-nvsd-agent
 %{_bindir}/quantum-nvsd-agent
-%{python_sitelib}/neutron/plugins/oneconvergence
 
 
 %files openvswitch
@@ -1013,7 +985,6 @@ fi
 %{_datadir}/neutron/neutron-openvswitch-agent.upstart
 %{_initrddir}/neutron-ovs-cleanup
 %{_datadir}/neutron/neutron-ovs-cleanup.upstart
-%{python_sitelib}/neutron/plugins/openvswitch
 %{_datarootdir}/neutron/rootwrap/openvswitch-plugin.filters
 %dir %{_sysconfdir}/neutron/plugins/openvswitch
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/openvswitch/*.ini
@@ -1022,7 +993,6 @@ fi
 %files plumgrid
 %doc LICENSE
 %doc neutron/plugins/plumgrid/README
-%{python_sitelib}/neutron/plugins/plumgrid
 %dir %{_sysconfdir}/neutron/plugins/plumgrid
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/plumgrid/*.ini
 
@@ -1034,7 +1004,6 @@ fi
 %{_bindir}/quantum-ryu-agent
 %{_initrddir}/neutron-ryu-agent
 %{_datadir}/neutron/neutron-ryu-agent.upstart
-%{python_sitelib}/neutron/plugins/ryu
 %{_datarootdir}/neutron/rootwrap/ryu-plugin.filters
 %dir %{_sysconfdir}/neutron/plugins/ryu
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
@@ -1047,7 +1016,6 @@ fi
 %{_bindir}/quantum-nec-agent
 %{_initrddir}/neutron-nec-agent
 %{_datadir}/neutron/neutron-nec-agent.upstart
-%{python_sitelib}/neutron/plugins/nec
 %{_datarootdir}/neutron/rootwrap/nec-plugin.filters
 %dir %{_sysconfdir}/neutron/plugins/nec
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nec/*.ini
@@ -1056,7 +1024,6 @@ fi
 %files metaplugin
 %doc LICENSE
 %doc neutron/plugins/metaplugin/README
-%{python_sitelib}/neutron/plugins/metaplugin
 %dir %{_sysconfdir}/neutron/plugins/metaplugin
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/metaplugin/*.ini
 
@@ -1075,7 +1042,6 @@ fi
 %{_bindir}/quantum-check-nvp-config
 %{_bindir}/neutron-check-nsx-config
 %{_bindir}/neutron-nsx-manage
-%{python_sitelib}/neutron/plugins/vmware
 %dir %{_sysconfdir}/neutron/plugins/vmware
 %dir %{_sysconfdir}/neutron/plugins/nicira
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
@@ -1092,6 +1058,13 @@ fi
 
 
 %changelog
+* Wed Jul 16 2014 Miguel Ángel Ajo <majopela at redhat.com> 2014.1.1-7
+- Moved all plugin sources to python-neutron to avoid breaking
+  hidden upstream dependencies from agents to plugins, etc.
+  fixes rhbz#1119619
+- Removed the hyper-v agent exclude.
+- Added a few LICENSE files to packages that missed it.
+
 * Thu Jul 10 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.1-6
 - updated runtime dependency not to use specially hacked version-packages