[openstack-neutron/f20] Moved all plugin sources to python-neutron to avoid breaking
Ihar Hrachyshka
ihrachyshka at fedoraproject.org
Wed Jul 16 14:12:18 UTC 2014
commit c13d24ee6d545de599415a1ce6c90a08067dcc7b
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 cc465d2..c16ba62 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2013.2.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.4.b3
Summary: OpenStack Networking Service
@@ -763,27 +763,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
@@ -791,7 +776,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
@@ -799,7 +783,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
@@ -809,9 +792,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
@@ -821,7 +802,6 @@ fi
%{_bindir}/neutron-linuxbridge-agent
%{_bindir}/quantum-linuxbridge-agent
%{_unitdir}/neutron-linuxbridge-agent.service
-%{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
@@ -830,24 +810,23 @@ 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
%{_unitdir}/neutron-mlnx-agent.service
-%{python_sitelib}/neutron/plugins/mlnx
%dir %{_sysconfdir}/neutron/plugins/mlnx
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
@@ -857,7 +836,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
@@ -871,7 +849,6 @@ fi
%{_bindir}/quantum-ovs-cleanup
%{_unitdir}/neutron-openvswitch-agent.service
%{_unitdir}/neutron-ovs-cleanup.service
-%{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
@@ -880,7 +857,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
@@ -891,7 +867,6 @@ fi
%{_bindir}/neutron-ryu-agent
%{_bindir}/quantum-ryu-agent
%{_unitdir}/neutron-ryu-agent.service
-%{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
@@ -903,7 +878,6 @@ fi
%{_bindir}/neutron-nec-agent
%{_bindir}/quantum-nec-agent
%{_unitdir}/neutron-nec-agent.service
-%{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
@@ -912,7 +886,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
@@ -933,6 +906,13 @@ fi
%changelog
+* Wed Jul 16 2014 Miguel Ángel Ajo <majopela at redhat.com> 2013.2.3-12
+- 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 24 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-11
- Send SIGTERM signal only to parent process when stopping neutron
service, bz#1110642
More information about the scm-commits
mailing list