[openstack-neutron/el6-icehouse] sync with master

[Alan Pevec]

commit af1014617c41069fe907a8cbb9e53f67c1b19c3d
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Apr 17 12:49:02 2014 +0200

    sync with master
    
    missing was patching of SOURCES.txt to include files added by patches

 openstack-neutron.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 46948f1..a3ab931 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.19.rc2%{?dist}
+Release:	0.19.1.rc2%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -485,6 +485,12 @@ IPSec.
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
+# Ensure SOURCES.txt ends in a newline and if any patches have added files, append them to SOURCES.txt
+[ -n "$(tail -c 1 < neutron.egg-info/SOURCES.txt)" ] && echo >> neutron.egg-info/SOURCES.txt
+if ls %{_sourcedir}/*.patch >/dev/null 2>&1; then
+awk '/^new file/ {split(a,files," ");print substr(files[3],3)} {a = $0}' %{_sourcedir}/*.patch >> neutron.egg-info/SOURCES.txt
+fi
+
 sed -i 's/RPMVERSION/%{version}/; s/RPMRELEASE/%{release}/' neutron/version.py
 
 chmod 644 neutron/plugins/cisco/README