[openstack-glance/f16] Switch to using update_patches.sh

[Mark McLoughlin]

commit d385f011fc877ea1fbbbf220384011e1d5f1f024
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Wed Apr 4 12:10:42 2012 +0100

    Switch to using update_patches.sh

 ...rence-the-glance-module-from-the-package-.patch |    5 +----
 ...-Don-t-access-the-net-while-building-docs.patch |    5 +----
 openstack-glance.spec                              |   19 +++++--------------
 3 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/0001-Always-reference-the-glance-module-from-the-package-.patch b/0001-Always-reference-the-glance-module-from-the-package-.patch
index df5f36e..abadd8f 100644
--- a/0001-Always-reference-the-glance-module-from-the-package-.patch
+++ b/0001-Always-reference-the-glance-module-from-the-package-.patch
@@ -1,4 +1,4 @@
-From 262950066eef1782d92b4dad973a88aa119ba9d6 Mon Sep 17 00:00:00 2001
+From 181459a3774faf0734ed184460fae425af0a8345 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 17:11:12 +0000
 Subject: [PATCH] Always reference the glance module from the package we're
@@ -30,6 +30,3 @@ index f058b52..3ecbb03 100644
  
  # -- General configuration ---------------------------------------------------
  
--- 
-1.7.6.5
-
diff --git a/0002-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
index c10be1e..b8e062d 100644
--- a/0002-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From f2b4bb4e45afcc178200966193a7b87401c534d7 Mon Sep 17 00:00:00 2001
+From da5f323e9bcba82169e3fb3944e53fb5edd76c76 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 17:12:54 +0000
 Subject: [PATCH] Don't access the net while building docs
@@ -22,6 +22,3 @@ index 3ecbb03..98c6bba 100644
                'sphinx.ext.pngmath',
                'sphinx.ext.graphviz',
                'sphinx.ext.todo']
--- 
-1.7.6.5
-
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 9f1888f..5f1b693 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -12,19 +12,10 @@ Source2:          openstack-glance-registry.service
 Source3:          openstack-glance.logrotate
 
 #
-# Patches managed here: https://github.com/markmc/glance/tree/fedora-patches
+# patches_base=2011.3.1
 #
-#   $> git format-patch -N 2011.3.1
-#   $> for p in 00*.patch; do filterdiff -x '*/.gitignore' -x '*/.mailmap' -x '*/Authors' -x '*/.bzrignore' $p | sponge $p; done
-#   $> for p in 00*.patch; do echo "Patch${p:2:2}:          $p"; done
-#   $> for p in 00*.patch; do echo "%patch${p:2:2} -p1"; done
-#
-
-# These are from stable/diablo
-
-# These are fedora specific
-Patch01:          0001-Always-reference-the-glance-module-from-the-package-.patch
-Patch02:          0002-Don-t-access-the-net-while-building-docs.patch
+Patch0001: 0001-Always-reference-the-glance-module-from-the-package-.patch
+Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -106,8 +97,8 @@ This package contains documentation files for glance.
 %prep
 %setup -q -n glance-%{version}
 
-%patch01 -p1
-%patch02 -p1
+%patch0001 -p1
+%patch0002 -p1
 
 sed -i 's|\(sql_connection = sqlite:///\)\(glance.sqlite\)|\1%{_sharedstatedir}/glance/\2|' etc/glance-registry.conf