[python-django-horizon] remove runtime dep to python-pbr

Alan Pevec apevec at fedoraproject.org
Fri May 2 18:38:45 UTC 2014


commit 8c5955dcd659f8024f52e2bf2297eadbc6d789da
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri May 2 20:06:56 2014 +0200

    remove runtime dep to python-pbr

 9999-remove-runtime-dep-to-python-pbr.patch |   36 +++++++++++++++++++++++++++
 python-django-horizon.spec                  |   10 ++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/9999-remove-runtime-dep-to-python-pbr.patch b/9999-remove-runtime-dep-to-python-pbr.patch
new file mode 100644
index 0000000..1d58088
--- /dev/null
+++ b/9999-remove-runtime-dep-to-python-pbr.patch
@@ -0,0 +1,36 @@
+From baac5ad38aab070602dcb02b6d3154783ac8b5bc Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Fri, 15 Nov 2013 09:42:08 +0100
+Subject: [PATCH] remove runtime dep to python-pbr
+
+Change-Id: I0b8f7fb6138feb2ba23f11065e53f1ded5091ed0
+Resolves: rhbz 1029775
+---
+ horizon/version.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/horizon/version.py b/horizon/version.py
+index 972f6ce..a129ea2 100644
+--- a/horizon/version.py
++++ b/horizon/version.py
+@@ -14,6 +14,15 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-import pbr.version
+ 
+-version_info = pbr.version.VersionInfo('horizon')
++class VersionInfo(object):
++    release = "REDHATRELEASE"
++    version = "REDHATVERSION"
++
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++version_info = VersionInfo()
+-- 
+1.9.0
+
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 77817c7..fcaa24c 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,7 +1,7 @@
 %global with_compression 1
 Name:       python-django-horizon
 Version:    2014.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -28,6 +28,8 @@ Patch0007: 0007-RCUE-navbar-and-login-screen.patch
 Patch0008: 0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
 Patch0009: 0009-fix-flake8-issues.patch
 
+Patch9999: 9999-remove-runtime-dep-to-python-pbr.patch
+
 
 #
 # BuildArch needs to be located below patches in the spec file. Don't ask!
@@ -175,6 +177,9 @@ git am %{patches}
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;
 
+sed -i s/REDHATVERSION/%{version}/ horizon/version.py
+sed -i s/REDHATRELEASE/%{release}/ horizon/version.py
+
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -367,6 +372,9 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.*
 
 %changelog
+* Fri May 02 2014 Alan Pevec <apevec at redhat.com> - 2014.1-2
+- remove requirement to python-pbr
+
 * Fri Apr 18 2014 Matthias Runge <mrunge at redhat.com> - 2014.1-1
 - rebase to 2014.1
 


More information about the scm-commits mailing list