[openstack-neutron/el6-havana] Moved all plugin sources to python-neutron to avoid breaking

[Ihar Hrachyshka]

commit 25161c1e060d66dbd3a42a54a3173e15c8ec18b9
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
    
    Resolves: rhbz#1120146
    
    Changelog:
    - Moved all plugin sources to python-neutron to avoid breaking
    - hidden upstream dependencies from agents to plugins, etc.
    - fixes rhbz#1120146
    - Removed the hyper-v agent exclude.
    - Added a few LICENSE files to packages that missed it.
    
    Change-Id: I51befd9c416ad37add0b58e643f4f9bfd5b242cd

 openstack-neutron.spec |   40 ++++++++++------------------------------
 1 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 03caae3..6085b87 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -856,27 +856,12 @@ 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/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/nec
-%exclude %{python_sitelib}/neutron/plugins/nicira
-%exclude %{python_sitelib}/neutron/plugins/openvswitch
-%exclude %{python_sitelib}/neutron/plugins/plumgrid
-%exclude %{python_sitelib}/neutron/plugins/ryu
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
 
 %files -n openstack-neutron-bigswitch
 %doc LICENSE
 %doc neutron/plugins/bigswitch/README
-%{python_sitelib}/neutron/plugins/bigswitch
 %dir %{_sysconfdir}/neutron/plugins/bigswitch
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
 
@@ -884,7 +869,6 @@ fi
 %files -n openstack-neutron-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
 
@@ -892,7 +876,6 @@ fi
 %files -n openstack-neutron-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
 
@@ -902,9 +885,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
 
 
@@ -915,7 +896,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
@@ -924,23 +904,22 @@ fi
 %files -n openstack-neutron-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 -n openstack-neutron-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 -n openstack-neutron-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
@@ -952,7 +931,6 @@ fi
 %doc neutron/plugins/nicira/README
 %{_bindir}/neutron-check-nvp-config
 %{_bindir}/quantum-check-nvp-config
-%{python_sitelib}/neutron/plugins/nicira
 %dir %{_sysconfdir}/neutron/plugins/nicira
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
 
@@ -968,7 +946,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
@@ -977,7 +954,6 @@ fi
 %files -n openstack-neutron-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
 
@@ -989,7 +965,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
@@ -1002,7 +977,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
@@ -1011,7 +985,6 @@ fi
 %files -n openstack-neutron-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
 
@@ -1034,6 +1007,13 @@ fi
 
 
 %changelog
+* Wed Jul 16 2014 Miguel Ángel Ajo <majopela at redhat.com> 2013.2.3-10
+- Moved all plugin sources to python-neutron to avoid breaking
+  hidden upstream dependencies from agents to plugins, etc.
+  fixes rhbz#1120146
+- Removed the hyper-v agent exclude.
+- Added a few LICENSE files to packages that missed it.
+
 * Tue Jun 17 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-9
 - Install SNAT rules for ipv4 only, bz#1110143