Hello community,
here is the log from the commit of package python-jsonpatch for
openSUSE:Factory checked in at 2019-05-22 10:51:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-jsonpatch (Old)
and /work/SRC/openSUSE:Factory/.python-jsonpatch.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jsonpatch"
Wed May 22 10:51:06 2019 rev:18 rq:703807 version:1.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-jsonpatch/python-jsonpatch.changes
2018-12-24 11:38:46.153591750 +0100
+++
/work/SRC/openSUSE:Factory/.python-jsonpatch.new.5148/python-jsonpatch.changes
2019-05-22 10:51:15.807330070 +0200
@@ -1,0 +2,8 @@
+Fri May 17 21:32:45 UTC 2019 - Scott Wulf <[email protected]>
+
+- Removing conflict with jsondiff
+ * Reasoning:
+ - moto requires cfn-lint and jsondiff
+ - cfn-lint requires jsonpatch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-jsonpatch.spec ++++++
--- /var/tmp/diff_new_pack.dDwqMf/_old 2019-05-22 10:51:16.595329619 +0200
+++ /var/tmp/diff_new_pack.dDwqMf/_new 2019-05-22 10:51:16.603329615 +0200
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,9 +31,6 @@
Requires: python-jsonpointer >= 1.9
Requires(post): update-alternatives
Requires(preun): update-alternatives
-# provides jsondiff binary too
-Conflicts: python2-jsondiff
-Conflicts: python3-jsondiff
BuildArch: noarch
%python_subpackages
@@ -50,24 +47,22 @@
%python_install
# Prepare for update-alternatives usage
-for p in jsonpatch jsondiff ; do
- %python_clone -a %{buildroot}%{_bindir}/$p
-done
+%python_clone -a %{buildroot}%{_bindir}/jsonpatch
+rm %{buildroot}%{_bindir}/jsondiff
%check
%python_exec tests.py
%post
-%python_install_alternative jsonpatch jsondiff
+%python_install_alternative jsonpatch
%preun
-%python_uninstall_alternative jsonpatch jsondiff
+%python_uninstall_alternative jsonpatch
%files %{python_files}
%license COPYING
%doc AUTHORS README.md
%python_alternative %{_bindir}/jsonpatch
-%python_alternative %{_bindir}/jsondiff
%{python_sitelib}/*
%changelog
