diff options
| -rw-r--r-- | ImageMagick6.spec | 222 |
1 files changed, 212 insertions, 10 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 36d63d1..38fad7f 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -8,8 +8,8 @@ # # Please preserve changelog entries # -%global VER 6.9.12 -%global Patchlevel 50 +%global VER 6.9.13 +%global Patchlevel 9 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -32,8 +32,12 @@ %global with_lqr 0 %endif -# from mock config, when rpmfusion enabled -%global with_libheif 0%{?_with_rpmfusion:1} +%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || 0%{?_with_rpmfusion:1} +# from distribution or from rpmfusion, when enabled in mock config +%global with_libheif 1 +%else +%global with_libheif 0 +%endif %global libname ImageMagick @@ -45,20 +49,29 @@ Epoch: 1 Epoch: 0 %endif -%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 38 +# No need to relocate as ImageMagick is v7 +Name: %{libname}6 +%global move 0 +%else +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 8 +# No need to relocate as same soname Name: %{libname} %global move 0 %else +# Need to relocate as different soname Name: %{libname}6 %global move 1 %endif +%endif Version: %{VER}.%{Patchlevel} Release: 1%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz -Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +#Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz +Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz BuildRequires: gcc BuildRequires: gcc-c++ @@ -125,6 +138,7 @@ BuildRequires: libraqm-devel %if %{with_lqr} BuildRequires: liblqr-1-devel %endif +BuildRequires: libgomp Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: ImageMagick-last < %{epoch}:%{version} @@ -223,6 +237,9 @@ Obsoletes: %{libname}6-libs <= %{epoch}:%{version}-%{release} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Recommends: urw-base35-fonts Recommends: open-sans-fonts +# Additional codecs +Recommends: %{name}-djvu%{?_isa} = %{epoch}:%{version}-%{release} +Recommends: %{name}-heic%{?_isa} = %{epoch}:%{version}-%{release} %else Requires: urw-base35-fonts Requires: open-sans-fonts @@ -270,6 +287,10 @@ Requires: libheif%{?_isa} >= 1.4.0 %else BuildRequires: pkgconfig(libheif) %endif +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 +# x265 HEVC encoder from RPMFusion +Recommends: libheif-freeworld%{?_isa} +%endif Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %if "%{name}" == "%{libname}" Obsoletes: %{libname}6-heic <= %{epoch}:%{version}-%{release} @@ -375,6 +396,9 @@ however. mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples +# revert https://github.com/ImageMagick/ImageMagick6/commit/f665638007d1f8627677a2c60ceda971c1d6cbb4 +sed -e '/INSTALL_BASE/d' -i PerlMagick/Makefile.PL* + %build export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" @@ -441,6 +465,7 @@ export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" --datadir=%{_datadir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ %endif + --enable-openmp \ --without-gcc-arch # Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild @@ -542,7 +567,7 @@ fi %{_mandir}/man1/%{libname}.* %files libs -%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt +%doc LICENSE NOTICE AUTHORS.txt %{_libdir}/libMagickCore%{?libsuffixe}.so.7* %{_libdir}/libMagickWand%{?libsuffixe}.so.7* %{_libdir}/%{libname}-%{VER} @@ -605,7 +630,7 @@ fi %endif %files c++ -%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README +%doc Magick++/AUTHORS %doc www/Magick++/COPYING %{_libdir}/libMagick++%{?libsuffixe}.so.9* @@ -627,8 +652,185 @@ fi %changelog -* Mon May 16 2022 Remi Collet <remi@remirepo.net> - 6.9.12.49-1 -- update to version 6.9.12 patch level 49 +* Mon Apr 22 2024 Remi Collet <remi@remirepo.net> - 6.9.13.9-1 +- update to version 6.9.13 patch level 9 + +* Mon Apr 8 2024 Remi Collet <remi@remirepo.net> - 6.9.13.8-1 +- update to version 6.9.13 patch level 8 + +* Mon Feb 26 2024 Remi Collet <remi@remirepo.net> - 6.9.13.7-1 +- update to version 6.9.13 patch level 7 + +* Mon Feb 12 2024 Remi Collet <remi@remirepo.net> - 6.9.13.6-1 +- update to version 6.9.13 patch level 6 + +* Mon Jan 22 2024 Remi Collet <remi@remirepo.net> - 6.9.13.5-1 +- update to version 6.9.13 patch level 5 +- drop patch merged upstream + +* Mon Jan 8 2024 Remi Collet <remi@remirepo.net> - 6.9.13.4-1 +- update to version 6.9.13 patch level 4 +- add weak dependency on libheif-freeworld from RPMFusion (Fedora and EL-9) +- drop patch merged upstream +- fix config command using patch from + https://github.com/ImageMagick/ImageMagick6/pull/303 + +* Mon Jan 1 2024 Remi Collet <remi@remirepo.net> - 6.9.13.3-1 +- update to version 6.9.13 patch level 3 +- add build patch from https://github.com/ImageMagick/ImageMagick6/pull/301 + +* Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 6.9.13.1-1 +- update to version 6.9.13 patch level 1 + +* Mon Dec 4 2023 Remi Collet <remi@remirepo.net> - 6.9.13.0-1 +- update to version 6.9.13 + +* Tue Oct 10 2023 Remi Collet <remi@remirepo.net> - 6.9.12.98-1 +- update to version 6.9.12 patch level 98 + +* Mon Oct 2 2023 Remi Collet <remi@remirepo.net> - 6.9.12.97-1 +- update to version 6.9.12 patch level 97 + +* Mon Sep 25 2023 Remi Collet <remi@remirepo.net> - 6.9.12.96-1 +- update to version 6.9.12 patch level 96 + +* Wed Sep 20 2023 Remi Collet <remi@remirepo.net> - 6.9.12.95-1 +- update to version 6.9.12 patch level 95 +- drop patch merged upstream + +* Mon Sep 18 2023 Remi Collet <remi@remirepo.net> - 6.9.12.94-1 +- update to version 6.9.12 patch level 94 +- fix build using patch from https://github.com/ImageMagick/ImageMagick6/pull/269 + +* Mon Jul 31 2023 Remi Collet <remi@remirepo.net> - 6.9.12.93-1 +- update to version 6.9.12 patch level 93 + +* Mon Jul 24 2023 Remi Collet <remi@remirepo.net> - 6.9.12.92-1 +- update to version 6.9.12 patch level 92 + +* Mon Jul 17 2023 Remi Collet <remi@remirepo.net> - 6.9.12.91-1 +- update to version 6.9.12 patch level 91 + +* Mon Jun 26 2023 Remi Collet <remi@remirepo.net> - 6.9.12.90-1 +- update to version 6.9.12 patch level 90 +- recommend heic and djvu codecs + +* Tue May 30 2023 Remi Collet <remi@remirepo.net> - 6.9.12.89-1 +- update to version 6.9.12 patch level 89 + +* Tue May 23 2023 Remi Collet <remi@remirepo.net> - 6.9.12.88-1 +- update to version 6.9.12 patch level 88 + +* Tue May 16 2023 Remi Collet <remi@remirepo.net> - 6.9.12.87-1 +- update to version 6.9.12 patch level 87 + +* Tue Apr 25 2023 Remi Collet <remi@remirepo.net> - 6.9.12.86-1 +- update to version 6.9.12 patch level 86 + +* Tue Apr 18 2023 Remi Collet <remi@remirepo.net> - 6.9.12.85-1 +- update to version 6.9.12 patch level 85 + +* Mon Apr 3 2023 Remi Collet <remi@remirepo.net> - 6.9.12.84-1 +- update to version 6.9.12 patch level 84 + +* Mon Mar 27 2023 Remi Collet <remi@remirepo.net> - 6.9.12.83-1 +- update to version 6.9.12 patch level 83 +- fix https://github.com/ImageMagick/ImageMagick6/issues/225 + using upstream patch + +* Mon Mar 20 2023 Remi Collet <remi@remirepo.net> - 6.9.12.82-1 +- update to version 6.9.12 patch level 82 + +* Mon Mar 13 2023 Remi Collet <remi@remirepo.net> - 6.9.12.81-1 +- update to version 6.9.12 patch level 81 + +* Fri Mar 10 2023 Remi Collet <remi@remirepo.net> - 6.9.12.80-1 +- update to version 6.9.12 patch level 80 + +* Thu Mar 9 2023 Remi Collet <remi@remirepo.net> - 6.9.12.78-1 +- update to version 6.9.12 patch level 78 + +* Mon Feb 13 2023 Remi Collet <remi@remirepo.net> - 6.9.12.77-1 +- update to version 6.9.12 patch level 77 + +* Mon Feb 6 2023 Remi Collet <remi@remirepo.net> - 6.9.12.76-1 +- update to version 6.9.12 patch level 76 + +* Tue Jan 31 2023 Remi Collet <remi@remirepo.net> - 6.9.12.75-1 +- update to version 6.9.12 patch level 75 + +* Fri Jan 27 2023 Remi Collet <remi@remirepo.net> - 6.9.12.73-1.1 +- F36 rebuild + +* Tue Jan 24 2023 Remi Collet <remi@remirepo.net> - 6.9.12.73-1 +- update to version 6.9.12 patch level 73 + +* Mon Jan 2 2023 Remi Collet <remi@remirepo.net> - 6.9.12.72-1 +- update to version 6.9.12 patch level 72 + +* Mon Dec 19 2022 Remi Collet <remi@remirepo.net> - 6.9.12.70-1 +- update to version 6.9.12 patch level 70 + +* Tue Dec 13 2022 Remi Collet <remi@remirepo.net> - 6.9.12.69-1 +- update to version 6.9.12 patch level 69 + +* Mon Dec 5 2022 Remi Collet <remi@remirepo.net> - 6.9.12.68-1 +- update to version 6.9.12 patch level 68 + +* Mon Nov 7 2022 Remi Collet <remi@remirepo.net> - 6.9.12.67-1 +- update to version 6.9.12 patch level 67 + +* Mon Oct 17 2022 Remi Collet <remi@remirepo.net> - 6.9.12.66-1 +- update to version 6.9.12 patch level 66 + +* Mon Oct 10 2022 Remi Collet <remi@remirepo.net> - 6.9.12.65-1 +- update to version 6.9.12 patch level 65 + +* Mon Sep 26 2022 Remi Collet <remi@remirepo.net> - 6.9.12.64-1 +- update to version 6.9.12 patch level 64 + +* Mon Sep 12 2022 Remi Collet <remi@remirepo.net> - 6.9.12.63-1 +- update to version 6.9.12 patch level 63 + +* Tue Aug 30 2022 Remi Collet <remi@remirepo.net> - 6.9.12.62-1 +- update to version 6.9.12 patch level 62 + +* Thu Aug 18 2022 Remi Collet <remi@remirepo.net> - 6.9.12.61-1 +- update to version 6.9.12 patch level 61 + +* Mon Aug 1 2022 Remi Collet <remi@remirepo.net> - 6.9.12.60-1 +- update to version 6.9.12 patch level 60 + +* Mon Jul 25 2022 Remi Collet <remi@remirepo.net> - 6.9.12.59-1 +- update to version 6.9.12 patch level 59 + +* Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 6.9.12.58-1 +- update to version 6.9.12 patch level 58 + +* Thu Jul 7 2022 Remi Collet <remi@remirepo.net> - 6.9.12.56-1 +- update to version 6.9.12 patch level 56 + +* Mon Jul 4 2022 Remi Collet <remi@remirepo.net> - 6.9.12.55-1 +- update to version 6.9.12 patch level 55 + +* Tue Jun 21 2022 Remi Collet <remi@remirepo.net> - 6.9.12.54-1 +- update to version 6.9.12 patch level 54 + +* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 6.9.12.53-1 +- update to version 6.9.12 patch level 53 + +* Tue Jun 7 2022 Remi Collet <remi@remirepo.net> - 6.9.12.52-1 +- update to version 6.9.12 patch level 52 + +* Tue May 31 2022 Remi Collet <remi@remirepo.net> - 6.9.12.51-1 +- update to version 6.9.12 patch level 51 + +* Thu May 19 2022 Remi Collet <remi@remirepo.net> - 6.9.12.50-2 +- rebuild as ImageMagick for EL-8 after + see https://github.com/remicollet/remirepo/issues/205 + +* Mon May 16 2022 Remi Collet <remi@remirepo.net> - 6.9.12.50-1 +- update to version 6.9.12 patch level 50 * Mon May 16 2022 Remi Collet <remi@remirepo.net> - 6.9.12.49-1 - update to version 6.9.12 patch level 49 |