diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-22 06:52:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-07-22 06:52:03 +0200 |
| commit | d7ad85c9535124b91b929d4ddd2d68b1ccb995cf (patch) | |
| tree | 56530c9e239e1d290444d1cf4bb007275252cd69 | |
| parent | 29a6f7ddaf07a1862ba6776bd846b4731bb224c5 (diff) | |
update to version 6.9.10 patch level 56
- drop patch merged upstream
| -rw-r--r-- | 53.patch | 22 | ||||
| -rw-r--r-- | ImageMagick6.spec | 9 |
2 files changed, 5 insertions, 26 deletions
diff --git a/53.patch b/53.patch deleted file mode 100644 index cbe3542..0000000 --- a/53.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fadb736e4409c0f962ff144a922ef974983e34ec Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 17 Jul 2019 15:47:29 +0200 -Subject: [PATCH] fix pkgconfig dependency - ---- - wand/MagickWand.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wand/MagickWand.pc.in b/wand/MagickWand.pc.in -index f1cf3cf33..53c5bae78 100644 ---- a/wand/MagickWand.pc.in -+++ b/wand/MagickWand.pc.in -@@ -9,7 +9,7 @@ Name: MagickWand - Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) - URL: https://github.com/ImageMagick/ImageMagick6 - Version: @PACKAGE_VERSION@ --Requires: MagickCore.@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -+Requires: MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ - Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ - Libs: -L${libdir} -l${libname} - Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ diff --git a/ImageMagick6.spec b/ImageMagick6.spec index edf5c35..5dc3d62 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.10 -%global Patchlevel 54 +%global Patchlevel 56 %global incsuffixe -6 %global libsuffixe -6.Q16 %global with_tests 0%{!?_without_tests:1} @@ -82,8 +82,6 @@ License: ImageMagick Url: http://www.imagemagick.org/ Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz -Patch0: https://patch-diff.githubusercontent.com/raw/ImageMagick/ImageMagick6/pull/53.patch - BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -383,7 +381,6 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} -%patch0 -p1 -b .pr53 # for %%doc mkdir Magick++/examples @@ -642,6 +639,10 @@ fi %changelog +* Mon Jul 22 2019 Remi Collet <remi@remirepo.net> - 6.9.10.56-1 +- update to version 6.9.10 patch level 56 +- drop patch merged upstream + * Wed Jul 17 2019 Remi Collet <remi@remirepo.net> - 6.9.10.54-1 - update to version 6.9.10 patch level 54 - build with IMPNG_SETJMP_IS_THREAD_SAFE |