python/python-jsonpatch
SHA256
15
0
Fork 0
forked from pool/python-jsonpatch
Code Pull Requests Activity

Accepting request 703805 from home:swulf:branches:devel:languages:python

Browse Source 
Removing conflict with jsondiff

OBS-URL: https://build.opensuse.org/request/show/703805
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonpatch?expand=0&rev=33
This commit is contained in:
Tomáš Chvátal
2019-05-17 22:01:31 +00:00
committed by Git OBS Bridge
parent 074e0b521a
commit 0b895ee9dd
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python-jsonpatch.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri May 17 21:32:45 UTC 2019 - Scott Wulf <swulf@suse.com>
- Removing conflict with jsondiff
* Reasoning:
- moto requires cfn-lint and jsondiff
- cfn-lint requires jsonpatch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 4 12:49:36 UTC 2018 - Matej Cepl <mcepl@suse.com> Tue Dec 4 12:49:36 UTC 2018 - Matej Cepl <mcepl@suse.com>

15
python-jsonpatch.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-jsonpatch # spec file for package python-jsonpatch
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -31,9 +31,6 @@ BuildRequires: python-rpm-macros
Requires: python-jsonpointer >= 1.9 Requires: python-jsonpointer >= 1.9
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(preun): update-alternatives Requires(preun): update-alternatives
# provides jsondiff binary too
Conflicts: python2-jsondiff
Conflicts: python3-jsondiff
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@@ -50,24 +47,22 @@ Python module to apply JSON-Patches (according to RFC 6902).
%python_install %python_install
# Prepare for update-alternatives usage # Prepare for update-alternatives usage
for p in jsonpatch jsondiff ; do %python_clone -a %{buildroot}%{_bindir}/jsonpatch
%python_clone -a %{buildroot}%{_bindir}/$p rm %{buildroot}%{_bindir}/jsondiff
done
%check %check
%python_exec tests.py %python_exec tests.py
%post %post
%python_install_alternative jsonpatch jsondiff %python_install_alternative jsonpatch
%preun %preun
%python_uninstall_alternative jsonpatch jsondiff %python_uninstall_alternative jsonpatch
%files %{python_files} %files %{python_files}
%license COPYING %license COPYING
%doc AUTHORS README.md %doc AUTHORS README.md
%python_alternative %{_bindir}/jsonpatch %python_alternative %{_bindir}/jsonpatch
%python_alternative %{_bindir}/jsondiff
%{python_sitelib}/* %{python_sitelib}/*
%changelog %changelog