vkmc pushed to python-designateclient (master). "Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-designateclient"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Mar 30 14:42:38 UTC 2015


>From 8df3d705d5a650b032af7c65405f8247fdf73e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victoria=20Mart=C3=ADnez=20de=20la=20Cruz?=
 <victoria at redhat.com>
Date: Mon, 30 Mar 2015 11:22:16 -0300
Subject: Remove pbr patch

This fix is no longer needed for the Fedora/RDO OpenStack packages.

diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
deleted file mode 100644
index 66b1152..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cb9c9a921c51d97749bfb048965c53a384a3843d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Victoria=20Mart=C3=ADnez=20de=20la=20Cruz?=
- <victoria at redhat.com>
-Date: Wed, 25 Feb 2015 14:58:08 -0300
-Subject: [PATCH] Remove runtime dependency on python pbr
-
----
- designateclient/version.py | 3 +--
- setup.py                   | 1 -
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/designateclient/version.py b/designateclient/version.py
-index cd56b54..6619a15 100644
---- a/designateclient/version.py
-+++ b/designateclient/version.py
-@@ -13,6 +13,5 @@
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- # License for the specific language governing permissions and limitations
- # under the License.
--import pbr.version
- 
--version_info = pbr.version.VersionInfo('python-designateclient')
-+version_info = "REDHATDESIGNATECLIENTVERSION" 
-diff --git a/setup.py b/setup.py
-index 7363757..09230a0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -26,5 +26,4 @@ except ImportError:
-     pass
- 
- setuptools.setup(
--    setup_requires=['pbr'],
-     pbr=True)
--- 
-2.1.0
-
diff --git a/python-designateclient.spec b/python-designateclient.spec
index b22848b..abbe966 100644
--- a/python-designateclient.spec
+++ b/python-designateclient.spec
@@ -6,7 +6,6 @@ Summary:        Client library for OpenStack DNSaaS API
 License:        ASL 2.0
 URL:            http://wiki.openstack.org/designate
 Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0:         0001-Remove-runtime-dependency-on-python-pbr.patch
 BuildArch:      noarch
  
 BuildRequires:  python2-devel
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-designateclient.git/commit/?h=master&id=06aeae289ee09f3bd771618fb756416099be6c04


More information about the scm-commits mailing list