From 6ee1dc660c3f8070ff75e3852071803d3f546f2eb4e723a9bc4761e7189170a6 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 16 Jan 2018 13:57:10 +0000 Subject: [PATCH] Accepting request 566321 from home:dimstar:Factory - Fix usage of fdupes macro: there is no '-n' parameter to the macro (there would be to fdupes, the command, though). Removing -n here results in the same package we had before; RPM prior to 4.14 reported this as warning in the buildlog, RPM 4.14 now marks it as error. OBS-URL: https://build.opensuse.org/request/show/566321 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=102 --- cloud-init.changes | 6 ++++++ cloud-init.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cloud-init.changes b/cloud-init.changes index f613a01..7a2eb4c 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 16 10:03:00 UTC 2018 - dimstar@opensuse.org + +- Fix usage of fdupes macro: there is no '-n' parameter to the + macro (there would be to fdupes, the command, though). + ------------------------------------------------------------------- Wed Dec 6 13:08:04 UTC 2017 - rjschwei@suse.com diff --git a/cloud-init.spec b/cloud-init.spec index 45ccc9a..c109f36 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -304,9 +304,9 @@ popd # remove duplicate files %if 0%{?suse_version} %if 0%{?suse_version} <= 1315 -%fdupes -n %{buildroot}%{python_sitelib} +%fdupes %{buildroot}%{python_sitelib} %else -%fdupes -n %{buildroot}%{python3_sitelib} +%fdupes %{buildroot}%{python3_sitelib} %endif %endif