From 4d13efb6d7eff5a7aa2107afbc7599675f7aad0b59ea6ef7fe65faeb45e90690 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 9 Jun 2018 04:40:50 +0000 Subject: [PATCH] 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 | 2 ++ python-unify.changes | 6 ++++++ python-unify.spec | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 README.suse diff --git a/README.suse b/README.suse new file mode 100644 index 0000000..9771ae9 --- /dev/null +++ b/README.suse @@ -0,0 +1,2 @@ +Note that the "unify" executable has been renamed to "unify_quotes" to +avoid conflicts with the wdiff package. diff --git a/python-unify.changes b/python-unify.changes index 8239dc0..3afe8e5 100644 --- a/python-unify.changes +++ b/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 diff --git a/python-unify.spec b/python-unify.spec index 748b02d..c0bf0b6 100644 --- a/python-unify.spec +++ b/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