[openstack-quantum] adjust to use master-patches branch for patch management

Pádraig Brady pbrady at fedoraproject.org
Tue Feb 26 16:22:19 UTC 2013


commit c0f2e7392ac74a5ec3d16e7f77abe86a7022edf0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Feb 26 16:19:10 2013 +0000

    adjust to use master-patches branch for patch management

 ...10a.patch => 0001-Add-midonet-to-setup.py.patch |    7 ++-----
 openstack-quantum.spec                             |    8 ++++++--
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/quantum.git-2379669383d08e128bbc18bbe082c6e2eadd710a.patch b/0001-Add-midonet-to-setup.py.patch
similarity index 90%
rename from quantum.git-2379669383d08e128bbc18bbe082c6e2eadd710a.patch
rename to 0001-Add-midonet-to-setup.py.patch
index 66598c9..fcda8f5 100644
--- a/quantum.git-2379669383d08e128bbc18bbe082c6e2eadd710a.patch
+++ b/0001-Add-midonet-to-setup.py.patch
@@ -1,4 +1,4 @@
-From 2379669383d08e128bbc18bbe082c6e2eadd710a Mon Sep 17 00:00:00 2001
+From ae2630679fcd527d2f3da652cc9c0428b4ac61b9 Mon Sep 17 00:00:00 2001
 From: Gary Kotton <gkotton at redhat.com>
 Date: Mon, 25 Feb 2013 17:10:15 +0000
 Subject: [PATCH] Add midonet to setup.py
@@ -8,7 +8,7 @@ Fixes bug 1132889
 Change-Id: I3334f515d85ea165b07b3ef576a043243c3c1bc0
 ---
  setup.py |    3 +++
- 1 file changed, 3 insertions(+)
+ 1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/setup.py b/setup.py
 index 7fcafd8..e265ab2 100644
@@ -31,6 +31,3 @@ index 7fcafd8..e265ab2 100644
      ]
  
      ConsoleScripts = [
--- 
-1.7.9.5
-
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 696d79c..bea2f9f 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -33,7 +33,11 @@ Source16:	quantum-l3-agent.service
 Source17:	quantum-metadata-agent.service
 Source18:	quantum-ovs-cleanup.service
 
-Patch01:	quantum.git-2379669383d08e128bbc18bbe082c6e2eadd710a.patch
+#
+# patches_base=2013.1.g3
+#
+Patch0001: 0001-Add-midonet-to-setup.py.patch
+
 
 BuildArch:	noarch
 
@@ -284,7 +288,7 @@ networks using multiple other quantum plugins.
 %prep
 %setup -q -n quantum-%{version}.%{release_letter}%{milestone}
 
-%patch01 -p1
+%patch0001 -p1
 
 sed -i 's/%{version}.%{release_letter}%{milestone}/%{version}/' PKG-INFO
 


More information about the scm-commits mailing list