[openstack-quantum] Update to folsom milestone 2

[Robert A. Kukura]

commit d818c14a0b74d233365cabd2c515df583af0b024
Author: Bob Kukura <rkukura at redhat.com>
Date:   Tue Aug 7 02:03:07 2012 -0400

    Update to folsom milestone 2

 .gitignore             |    2 +-
 openstack-quantum.spec |   22 ++++++++++++++--------
 sources                |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2407137..16a44a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/quantum-2012.1.tar.gz
+/quantum-2012.2~f2.tar.gz
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 09210b2..0a7daf3 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -1,17 +1,17 @@
 #
-# This is 2012.1 essex release
+# This is 2012.2 folsom milestone 2
 #
 
 Name:		openstack-quantum
-Version:	2012.1
-Release:	3%{?dist}
+Version:	2012.2
+Release:	0.1.f2%{?dist}
 Summary:	Virtual network service for OpenStack (quantum)
 
 Group:		Applications/System
 License:	ASL 2.0
 URL:		http://launchpad.net/quantum/
 
-Source0:	https://launchpad.net/quantum/essex/2012.1/+download/quantum-2012.1.tar.gz
+Source0:	https://launchpad.net/quantum/folsom/folsom-2/+download/quantum-2012.2~f2.tar.gz
 Source1:	quantum.logrotate
 Source2:	quantum-sudoers
 Source4:	quantum-server-setup
@@ -54,9 +54,7 @@ etc.)
 Summary:	Quantum Python libraries
 Group:		Applications/System
 
-Requires:	python-quantumclient >= %{version}
 Requires:	MySQL-python
-Requires:	python-configobj
 Requires:	python-eventlet
 Requires:	python-lxml
 Requires:	python-gflags
@@ -79,6 +77,7 @@ Summary:	Quantum Cisco plugin
 Group:		Applications/System
 
 Requires:	openstack-quantum = %{version}-%{release}
+Requires:	python-configobj
 
 
 %description -n openstack-quantum-cisco
@@ -162,6 +161,9 @@ find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
 chmod 644 quantum/plugins/cisco/README
 dos2unix quantum/plugins/cisco/README
 
+# Remove broken files (REVISIT)
+rm quantum/plugins/nicira/nicira_nvp_plugin/cli.py
+
 
 %build
 %{__python} setup.py build
@@ -177,7 +179,7 @@ rm -rf %{buildroot}%{python_sitelib}/tools
 rm -rf %{buildroot}%{python_sitelib}/quantum/tests
 rm -rf %{buildroot}%{python_sitelib}/quantum/plugins/*/tests
 rm -f %{buildroot}%{python_sitelib}/quantum/plugins/*/run_tests.*
-rm %{buildroot}/usr/etc/quantum/quantum.conf.test
+#rm %%{buildroot}/usr/etc/quantum/quantum.conf.test
 rm %{buildroot}/usr/etc/init.d/quantum-server
 
 # Install execs (using hand-coded rather than generated versions)
@@ -307,7 +309,8 @@ fi
 %{_unitdir}/quantum-server.service
 %dir %{_sysconfdir}/quantum
 %config(noreplace) %{_sysconfdir}/quantum/quantum.conf
-%config(noreplace) %{_sysconfdir}/quantum/plugins.ini
+%config(noreplace) %{_sysconfdir}/quantum/api-paste.ini
+%config(noreplace) %{_sysconfdir}/quantum/policy.json
 %dir %{_sysconfdir}/quantum/plugins
 %config(noreplace) %{_sysconfdir}/logrotate.d/*
 %config(noreplace) %{_sysconfdir}/sudoers.d/quantum
@@ -398,6 +401,9 @@ fi
 
 
 %changelog
+* Tue Aug  7 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.1.f2
+- Update to folsom milestone 2
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index cd3cb73..e841524 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4754b0b0955c96f364aa4e8a0acb408a  quantum-2012.1.tar.gz
+f5dd47556fcfc7621d21d64db74a5903  quantum-2012.2~f2.tar.gz