diff --git a/copr-cli-1.111.tar.gz b/copr-cli-1.111.tar.gz deleted file mode 100644 index 5af3376..0000000 --- a/copr-cli-1.111.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1274a41d195adcebbe683b4c15b2565b35dcfccae0e6fed206f1d27ef701d5bc -size 66350 diff --git a/copr-cli-2.0.tar.gz b/copr-cli-2.0.tar.gz new file mode 100644 index 0000000..a3f0671 --- /dev/null +++ b/copr-cli-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5783dba3336a16fd4ba8d8927e7db30d2f411085e44c1215b22be678d693a3a0 +size 64600 diff --git a/python-copr-cli.changes b/python-copr-cli.changes index df5c37d..5d986c4 100644 --- a/python-copr-cli.changes +++ b/python-copr-cli.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 12 21:00:03 UTC 2024 - Richard Rahl + +- update to 2.0: + * no upstream changelog +- remove remove-simplejson.patch, as upstream removed simplejson + ------------------------------------------------------------------- Sat Apr 20 13:40:42 UTC 2024 - Dirk Müller diff --git a/python-copr-cli.spec b/python-copr-cli.spec index d9e398d..02fe481 100644 --- a/python-copr-cli.spec +++ b/python-copr-cli.spec @@ -17,16 +17,12 @@ Name: python-copr-cli -Version: 1.111 +Version: 2.0 Release: 0 Summary: Copr cli License: GPL-2.0-or-later URL: https://github.com/fedora-copr/copr Source: https://files.pythonhosted.org/packages/source/c/copr-cli/copr-cli-%{version}.tar.gz -# PATCH-FIX-UPSTREAM remove-simplejson.patch gh#fedora-copr/copr#2539 mcepl@suse.com -# Remove dependency on simplejson -# (not upstream, which on master switched to ujson) -Patch0: remove-simplejson.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} diff --git a/remove-simplejson.patch b/remove-simplejson.patch deleted file mode 100644 index 02eb22f..0000000 --- a/remove-simplejson.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- - copr-cli.spec | 4 ---- - copr_cli/util.py | 4 ++-- - setup.py | 1 - - 3 files changed, 2 insertions(+), 7 deletions(-) - -Index: copr-cli-1.110/copr-cli.spec -=================================================================== ---- copr-cli-1.110.orig/copr-cli.spec -+++ copr-cli-1.110/copr-cli.spec -@@ -32,7 +32,6 @@ BuildRequires: util-linux - %if %{with python3} - Requires: python3-copr >= %min_python_copr_version - Requires: python3-jinja2 --Requires: python3-simplejson - Requires: python3-humanize - Requires: python3-koji - -@@ -46,12 +45,10 @@ BuildRequires: python3-humanize - BuildRequires: python3-pytest - BuildRequires: python3-responses - BuildRequires: python3-setuptools --BuildRequires: python3-simplejson - BuildRequires: python3-munch - %else - Requires: python-copr >= %min_python_copr_version - Requires: python-jinja2 --Requires: python-simplejson - Requires: python-humanize - - BuildRequires: pytest -@@ -62,7 +59,6 @@ BuildRequires: python-humanize - BuildRequires: python-mock - BuildRequires: python2-responses - BuildRequires: python-setuptools --BuildRequires: python-simplejson - BuildRequires: python-munch - %endif - -Index: copr-cli-1.110/copr_cli/util.py -=================================================================== ---- copr-cli-1.110.orig/copr_cli/util.py -+++ copr-cli-1.110/copr_cli/util.py -@@ -1,7 +1,7 @@ - # coding: utf-8 - - import humanize --import simplejson -+import json - - - try: -@@ -66,4 +66,4 @@ def serializable(result): - - - def json_dumps(result): -- return simplejson.dumps(serializable(result), indent=4, sort_keys=True, for_json=True) -+ return json.dumps(serializable(result), indent=4, sort_keys=True) -Index: copr-cli-1.110/setup.py -=================================================================== ---- copr-cli-1.110.orig/setup.py -+++ copr-cli-1.110/setup.py -@@ -16,7 +16,6 @@ This part is a command line interface to - requires = [ - 'copr', - 'humanize', -- 'simplejson', - 'jinja2', - 'setuptools', - ]