Accepting request 615330 from home:TheBlackCat:branches:devel:languages:python

- Fix conflicts with wdiff.
  The "unify" executable has been renamed to "unify_quotes"

OBS-URL: https://build.opensuse.org/request/show/615330
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-unify?expand=0&rev=2

README.suse

@@ -0,0 +1,2 @@
+Note that the "unify" executable has been renamed to "unify_quotes" to
+avoid conflicts with the wdiff package.

python-unify.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun  9 04:35:32 UTC 2018 - toddrme2178@gmail.com
+
+- Fix conflicts with wdiff.
+  The "unify" executable has been renamed to "unify_quotes"
+
 -------------------------------------------------------------------
 Thu May 24 17:51:37 UTC 2018 - toddrme2178@gmail.com
 

python-unify.spec

@@ -37,7 +37,10 @@ BuildArch:      noarch
 %python_subpackages
 
 %description
-Modifies strings to all use the same (single/double) quote where possible
+Modifies strings to all use the same (single/double) quote where possible.
+
+Note that the "unify" executable has been renamed to "unify_quotes" to
+avoid conflicts with the wdiff package.
 
 %prep
 %setup -q -n unify-%{version}
@@ -49,10 +52,11 @@ sed -i -e '/^#!\//, 1d' unify.py
 %install
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+mv %{buildroot}%{_bindir}/unify %{buildroot}%{_bindir}/unify_quotes
 
 %files %{python_files}
 %doc README.rst
-%python3_only %{_bindir}/unify
+%python3_only %{_bindir}/unify_quotes
 %{python_sitelib}/*
 
 %changelog