From e9b26799fa8f4a12e2f37a160925c172db6d82d6 Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Fri, 14 Feb 2014 16:48:18 +0400 Subject: [PATCH] Remove already applied patches Fix RPM spec Change-Id: Idd3dbc2a86035faa3a74f334fd1b67ad8f6dbdb5 --- debian/patches/series | 1 - rpm/SPECS/openstack-neutron.spec | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 1e91a8c70..aa0010058 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ disable-udev-tests.patch bump-sqlalchemy-version.patch disable-ml2-notification-tests.patch remove-jsonrpclib.patch -MIRA001-Send-DHCP-notifications-regardless-of-agent-status.patch diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index 4d7728905..82f809758 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -422,7 +422,7 @@ IPSec. %setup -q -n neutron-%{version} %patch0001 -p1 -%patch0002 -p1 +#%patch0002 -p1 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + @@ -800,6 +800,7 @@ fi %attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/api-paste.ini %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini +%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini -- 2.32.3