summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick-perl.patch36
-rw-r--r--ImageMagick6.spec10
2 files changed, 5 insertions, 41 deletions
diff --git a/ImageMagick-perl.patch b/ImageMagick-perl.patch
deleted file mode 100644
index e971109..0000000
--- a/ImageMagick-perl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9740f729f8752d429fdcde4927c740a9d66541b3 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 6 Apr 2021 07:06:29 +0200
-Subject: [PATCH] fix perl syntax
-
----
- PerlMagick/default/Makefile.PL.in | 2 +-
- PerlMagick/quantum/Makefile.PL.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/PerlMagick/default/Makefile.PL.in b/PerlMagick/default/Makefile.PL.in
-index 5f6cf3a0b..a71ae10ec 100644
---- a/PerlMagick/default/Makefile.PL.in
-+++ b/PerlMagick/default/Makefile.PL.in
-@@ -162,7 +162,7 @@ foreach my $delegate (@tested_delegates) {
-
- # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
- my $INC_magick = '-I../.. -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
--my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE'
-+my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
- my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
- my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
- my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
-diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in
-index c2b627c1c..21a534a5d 100644
---- a/PerlMagick/quantum/Makefile.PL.in
-+++ b/PerlMagick/quantum/Makefile.PL.in
-@@ -162,7 +162,7 @@ foreach my $delegate (@tested_delegates) {
-
- # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
- my $INC_magick = '-I../../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
--my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE'
-+my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE';
- my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
- my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
- my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@";
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index b8c6a06..411bb24 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 6.9.12
-%global Patchlevel 6
+%global Patchlevel 7
%global incsuffixe -6
%global libsuffixe -6.Q16
%bcond_without tests
@@ -57,9 +57,6 @@ 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
-# Fix perl syntax
-Patch0: %{libname}-perl.patch
-
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -352,7 +349,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1
# for %%doc
mkdir Magick++/examples
@@ -611,6 +607,10 @@ fi
%changelog
+* Tue Apr 13 2021 Remi Collet <remi@remirepo.net> - 6.9.12.7-1
+- update to version 6.9.12 patch level 7
+- drop patch merged upstream
+
* Tue Apr 6 2021 Remi Collet <remi@remirepo.net> - 6.9.12.6-1
- update to version 6.9.12 patch level 6
- fix perl syntax using patch from