diff --git a/.gitignore b/.gitignore index 7915a29..d59c863 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jira-python-0.13.tar.gz +/jira-0.50.tar.gz diff --git a/python-jira-no-mime-detection.patch b/python-jira-no-mime-detection.patch index 0611be4..bffcbea 100644 --- a/python-jira-no-mime-detection.patch +++ b/python-jira-no-mime-detection.patch @@ -1,37 +1,29 @@ -From d4d10bd932ba1fb2a6ce279cae235693caadeb5c Mon Sep 17 00:00:00 2001 +From baa04780f473ceb1dcd2af43dd6ee61fd56b3a2b Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Fri, 22 Nov 2013 11:21:43 -0500 -Subject: [PATCH] Patch out mime detection. +Date: Tue, 10 May 2016 13:00:32 -0400 +Subject: [PATCH] no mime detection --- - jira/client.py | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) + jira/client.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jira/client.py b/jira/client.py -index 6a8c2f9..a3693d3 100644 +index 6dc54d5..110f453 100644 --- a/jira/client.py +++ b/jira/client.py -@@ -1432,11 +1432,15 @@ class JIRA(object): - return resource +@@ -234,7 +234,11 @@ class JIRA(object): + if len(context_path) > 0: + self._options['context_path'] = context_path - def _try_magic(self): -- try: -- import magic -- self._magic = magic.Magic(mime=True) -- except ImportError: -- self._magic = None +- self._try_magic() + # This is patched out for Fedora because python-jira is expecting a + # different magic module than the one we ship. See: + # https://bugzilla.redhat.com/show_bug.cgi?id=1025368#c11 ++ #self._try_magic() + self._magic = None -+ #try: -+ # import magic -+ # self._magic = magic.Magic(mime=True) -+ #except ImportError: -+ # self._magic = None - def _get_mime_type(self, buff): - if self._magic is not None: + if oauth: + self._create_oauth_session(oauth) -- -1.8.4.2 +2.5.5 diff --git a/python-jira.spec b/python-jira.spec index 760ae2e..4cdf411 100644 --- a/python-jira.spec +++ b/python-jira.spec @@ -3,14 +3,14 @@ %global eggname jira Name: python-jira -Version: 0.13 -Release: 8%{?dist} +Version: 0.50 +Release: 1%{?dist} Summary: A library to ease use of the JIRA 5 REST APIs. Group: Development/Libraries License: BSD -URL: http://pypi.python.org/pypi/%{distname} -Source0: http://pypi.python.org/packages/source/j/%{distname}/%{distname}-%{version}.tar.gz +URL: https://pypi.io/project/%{distname} +Source0: https://pypi.io/packages/source/j/%{distname}/%{distname}-%{version}.tar.gz Patch0: python-jira-no-mime-detection.patch BuildArch: noarch @@ -20,15 +20,21 @@ BuildRequires: python-setuptools BuildRequires: python-requests BuildRequires: python-requests-oauthlib +BuildRequires: python-requests-toolbelt BuildRequires: python-tlslite BuildRequires: python-magic BuildRequires: python-ipython-console +BuildRequires: python-pytest +BuildRequires: python-six + Requires: python-requests Requires: python-requests-oauthlib +Requires: python-requests-toolbelt Requires: python-tlslite Requires: python-magic Requires: python-ipython-console +Requires: python-six %description A library to ease use of the JIRA 5 REST APIs. @@ -38,6 +44,7 @@ A library to ease use of the JIRA 5 REST APIs. %patch0 -p1 sed -i 's/tools.jirashell/jira.tools.jirashell/g' setup.py +sed -i "s/'ordereddict'//" setup.py # Remove bundled egg-info in case it exists rm -rf %{distname}.egg-info @@ -48,9 +55,6 @@ rm -rf %{distname}.egg-info %install %{__python2} setup.py install -O1 --skip-build --root=%{buildroot} -# Move this into the jira namespace. It gets fixed in a more modern version. -mv %{buildroot}%{python2_sitelib}/tools/ %{buildroot}%{python2_sitelib}/jira/tools/ - # Why does it even install these? A mistake. rm -rf %{buildroot}%{python2_sitelib}/tests/ @@ -70,6 +74,9 @@ rm -rf %{buildroot}%{python2_sitelib}/tests/ %changelog +* Tue May 10 2016 Ralph Bean - 0.50-1 +- new version + * Thu Feb 04 2016 Fedora Release Engineering - 0.13-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 336e6cd..e39d99c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd9d9930559fd201fcf1cb5b765fa368 jira-python-0.13.tar.gz +23abea2446beb4161ce50bab13654319 jira-0.50.tar.gz