Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/doxygen.git#4be37ca6b9ef7ab445931fec5144a7bec88418d4

.gitignore

@@ -51,3 +51,4 @@ doxygen-1.7.1.src.tar.gz
 /doxygen-1.8.16.src.tar.gz
 /doxygen-1.8.17.src.tar.gz
 /doxygen-1.8.18.src.tar.gz
+/doxywizard-icons.tar.xz

doxygen.spec

@@ -16,7 +16,7 @@ Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   1
 Version: 1.8.20
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # No version is specified.
 License: GPL+
@@ -24,6 +24,8 @@ Url: http://www.doxygen.nl
 Source0: http://doxygen.nl/files/%{name}-%{version}.src.tar.gz
 # this icon is part of kdesdk
 Source1: doxywizard.desktop
+# these icons are part of doxygen and converted from doxywizard.ico
+Source2: doxywizard-icons.tar.xz
 # upstream patches
 Patch0: doxygen-1.8.20-enums-multiple-files.patch
 Patch1: doxygen-different-results-on-64-and-32-bit.patch
@@ -35,7 +37,6 @@ Patch6: doxygen-1.8.20-does-not-handle-simple-example-in-md-file.patch
 Patch7: doxygen-1.8.20-attribute-target-redefined-in-svg.patch
 
 BuildRequires: %{_bindir}/python3
-BuildRequires: ImageMagick
 BuildRequires: gcc-c++ gcc
 BuildRequires: perl-interpreter
 %if ! 0%{?_module_build}
@@ -211,7 +212,7 @@ Requires: texlive-epstopdf
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -a2
 
 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
@@ -249,9 +250,6 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
 %install
 %cmake_install
 
-# convert icons
-convert addon/doxywizard/doxywizard.ico doxywizard.png
-
 # install icons
 icondir=%{buildroot}%{_datadir}/icons/hicolor
 mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
@@ -310,6 +308,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %endif
 
 %changelog
+* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.8.20-6
+- drop BR on ImageMagick in RHEL
+
 * Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.8.20-5
 - backport upstream patches
 

sources

@@ -1 +1,2 @@
 SHA512 (doxygen-1.8.20.src.tar.gz) = 15dc95850440aed2a56971d8c04bf3bdfac861bcc38c60c7be22fd3b922b9fe2a750ea8877cb0716832bb6ad7901afcdf4950ba985b09890027030bdf828eee3
+SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad