From 1cdbff151b9ffc5d99ed77d8dd3ced6e602f1bca229618ae86f3c05770f2431c Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Mon, 18 Jul 2016 05:54:23 +0000 Subject: [PATCH] Accepting request 408509 from home:jsegitz:branches:devel:languages:python - Update to version 1.2.2 - Added NovellBugzilla.patch to ensure it works with SUSE internal bugzilla. OBS-URL: https://build.opensuse.org/request/show/408509 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bugzilla?expand=0&rev=36 --- NovellBugzilla.patch | 13 +++++++++++++ python-bugzilla-0.9.0suse3.tar.bz2 | 3 --- python-bugzilla-1.2.2.tar.bz2 | 3 +++ python-bugzilla.changes | 7 +++++++ python-bugzilla.spec | 9 ++++++--- 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 NovellBugzilla.patch delete mode 100644 python-bugzilla-0.9.0suse3.tar.bz2 create mode 100644 python-bugzilla-1.2.2.tar.bz2 diff --git a/NovellBugzilla.patch b/NovellBugzilla.patch new file mode 100644 index 0000000..930f3f9 --- /dev/null +++ b/NovellBugzilla.patch @@ -0,0 +1,13 @@ +Index: python-bugzilla-1.2.2/build/lib/bugzilla/base.py +=================================================================== +--- python-bugzilla-1.2.2.orig/build/lib/bugzilla/base.py 2016-07-12 10:17:49.836875522 +0200 ++++ python-bugzilla-1.2.2/build/lib/bugzilla/base.py 2016-07-14 15:09:36.151992677 +0200 +@@ -994,7 +994,7 @@ class BugzillaBase(object): + log.debug("Calling Bug.get with: %s", getbugdata) + r = self._proxy.Bug.get(getbugdata) + +- if self.bz_ver_major >= 4: ++ if self.bz_ver_major >= 4 or self.__class__.__name__=='NovellBugzilla': + bugdict = dict([(b['id'], b) for b in r['bugs']]) + else: + bugdict = dict([(b['id'], b['internals']) for b in r['bugs']]) diff --git a/python-bugzilla-0.9.0suse3.tar.bz2 b/python-bugzilla-0.9.0suse3.tar.bz2 deleted file mode 100644 index 753578b..0000000 --- a/python-bugzilla-0.9.0suse3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:898282966a8a1b013a461434a9c91b8a9703a5bdbbbe5e1f12572ebfec747f5e -size 53240 diff --git a/python-bugzilla-1.2.2.tar.bz2 b/python-bugzilla-1.2.2.tar.bz2 new file mode 100644 index 0000000..89fd55f --- /dev/null +++ b/python-bugzilla-1.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78fc57bd8ca78511c7221656690c6479ce81500ff5e812fdc631d46018580608 +size 1200113 diff --git a/python-bugzilla.changes b/python-bugzilla.changes index 447814a..6ee68c9 100644 --- a/python-bugzilla.changes +++ b/python-bugzilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 14 13:09:51 UTC 2016 - jsegitz@novell.com + +- Update to version 1.2.2 +- Added NovellBugzilla.patch to ensure it works with SUSE internal + bugzilla. + ------------------------------------------------------------------- Tue Sep 23 12:32:08 UTC 2014 - bwiedemann@suse.com diff --git a/python-bugzilla.spec b/python-bugzilla.spec index 61c7f92..11e6d9d 100644 --- a/python-bugzilla.spec +++ b/python-bugzilla.spec @@ -1,7 +1,7 @@ # # spec file for package python-bugzilla # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,25 @@ Name: python-bugzilla -Version: 0.9.0suse3 +Version: 1.2.2 Release: 0 Summary: Python library for bugzilla License: GPL-2.0+ Group: Development/Libraries/Python Url: https://fedorahosted.org/python-bugzilla/ Source: %{name}-%{version}.tar.bz2 +Patch0: NovellBugzilla.patch # https://gitorious.org/opensuse/python-bugzilla BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +BuildRequires: python-setuptools %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif Requires: python-pycurl +Requires: python-requests Suggests: osc %description @@ -48,6 +51,7 @@ but gosh - why not just write something in Python instead? %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" python setup.py build @@ -57,7 +61,6 @@ python setup.py install --root=%{buildroot} --prefix=%{_prefix} %files %defattr(-,root,root,-) -%doc README %{_bindir}/bugzilla %{python_sitelib}/bugzilla %{python_sitelib}/python_bugzilla-%{version}-py%{py_ver}.egg-info