From e8380fa090a6e1597136e8d9eecac6d6e33ba192b78cf0e27ec282b9a5159589 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 2 Dec 2013 10:30:13 +0000 Subject: [PATCH] Accepting request 209136 from home:pgajdos - png_fix macro doesn't leave *.png.fixed (which happened for correct PNGs) [bnc#852862] OBS-URL: https://build.opensuse.org/request/show/209136 OBS-URL: https://build.opensuse.org/package/show/graphics/libpng16?expand=0&rev=47 --- libpng16.changes | 6 ++++++ rpm-macros.libpng-tools | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libpng16.changes b/libpng16.changes index b55b117..b33829d 100644 --- a/libpng16.changes +++ b/libpng16.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 2 09:35:17 UTC 2013 - pgajdos@suse.com + +- png_fix macro doesn't leave *.png.fixed (which happened for correct + PNGs) [bnc#852862] + ------------------------------------------------------------------- Fri Nov 15 07:56:22 UTC 2013 - pgajdos@suse.com diff --git a/rpm-macros.libpng-tools b/rpm-macros.libpng-tools index 65c1c46..fc316a6 100644 --- a/rpm-macros.libpng-tools +++ b/rpm-macros.libpng-tools @@ -12,7 +12,8 @@ echo "Missing argument in call to %%png_fix: path and name of png file." \ exit 1 \ fi \ - /usr/bin/pngfix %{-q: -qq} --suffix='.fixed' "%1" || mv "%1.fixed" "%1" \ + /usr/bin/pngfix %{-q: -qq} --suffix='.fixed' "%1" || true \ + mv "%1.fixed" "%1" \ %nil # # macro: %png_fix_dir