diff --git a/python-textfsm.changes b/python-textfsm.changes index 1bf1e2e..35a63a1 100644 --- a/python-textfsm.changes +++ b/python-textfsm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 20 10:50:25 UTC 2020 - ecsos + +- Remove Conflicts: python-texttable because it should fixed since + version 1.0.0. https://github.com/google/textfsm/issues/77 + texttable.py is now in subdir textfsm. + ------------------------------------------------------------------- Tue Nov 26 19:25:18 UTC 2019 - Martin Hauke diff --git a/python-textfsm.spec b/python-textfsm.spec index 622db38..572fa78 100644 --- a/python-textfsm.spec +++ b/python-textfsm.spec @@ -1,7 +1,7 @@ # # spec file for package python-textfsm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,11 +38,7 @@ Requires: python-six %ifpython2 Requires: python-future %endif -Conflicts: python-texttable BuildArch: noarch -%ifpython2 -Conflicts: %{oldpython}-texttable -%endif %python_subpackages %description