[packages/ImageMagick/ImageMagick-6] - adjust config files for 6 suffix - rel 3
baggins
baggins at pld-linux.org
Tue Dec 27 09:06:29 CET 2016
commit 70534de9c8c235e683220a322de05d8e497a1076
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Dec 27 09:06:02 2016 +0100
- adjust config files for 6 suffix
- rel 3
ImageMagick.spec | 4 +-
magick6.patch | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+), 1 deletion(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index c000039..b1638b8 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -36,7 +36,7 @@ Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window
Name: ImageMagick6
Version: %{ver}%{?pver:.%{pver}}
-Release: 2
+Release: 3
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
@@ -48,6 +48,7 @@ Patch2: %{origname}-libpath.patch
Patch3: %{origname}-ldflags.patch
Patch4: %{origname}-lt.patch
Patch5: perlmagick.patch
+Patch6: magick6.patch
URL: http://www.imagemagick.org/
%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
@@ -672,6 +673,7 @@ Moduł kodera dla plików WMF.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
diff --git a/magick6.patch b/magick6.patch
new file mode 100644
index 0000000..4b9a90b
--- /dev/null
+++ b/magick6.patch
@@ -0,0 +1,186 @@
+--- ImageMagick-6.9.7-0/magick/Magick-config.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/magick/Magick-config.in 2016-12-27 08:35:51.406200932 +0100
+@@ -8,11 +8,11 @@
+ exec_prefix=@exec_prefix@
+
+ usage="\
+-Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
++Usage: Magick6-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+- echo "Example: gcc \`Magick-config --cflags --cppflags\` -o core core.c \`Magick-config --ldflags --libs\`" 1>&2
++ echo "Example: gcc \`Magick6-config --cflags --cppflags\` -o core core.c \`Magick6-config --ldflags --libs\`" 1>&2
+ exit 1
+ fi
+
+@@ -38,19 +38,19 @@
+ echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ ;;
+ --cflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --cxxflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --cppflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --ldflags)
+- pkg-config --libs MagickCore
++ pkg-config --libs MagickCore6
+ ;;
+ --libs)
+- pkg-config --libs MagickCore
++ pkg-config --libs MagickCore6
+ ;;
+ *)
+ echo "${usage}" 1>&2
+--- ImageMagick-6.9.7-0/magick/MagickCore-config.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/magick/MagickCore-config.in 2016-12-27 08:37:09.821645212 +0100
+@@ -8,11 +8,11 @@
+ exec_prefix=@exec_prefix@
+
+ usage="\
+-Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
++Usage: MagickCore6-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+- echo "Example: gcc \`MagickCore-config --cflags --cppflags\` -o core core.c \`Magick-config --ldflags --libs\`" 1>&2
++ echo "Example: gcc \`MagickCore6-config --cflags --cppflags\` -o core core.c \`Magick6-config --ldflags --libs\`" 1>&2
+ exit 1
+ fi
+
+@@ -38,19 +38,19 @@
+ echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ ;;
+ --cflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --cxxflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --cppflags)
+- pkg-config --cflags MagickCore
++ pkg-config --cflags MagickCore6
+ ;;
+ --ldflags)
+- pkg-config --libs MagickCore
++ pkg-config --libs MagickCore6
+ ;;
+ --libs)
+- pkg-config --libs MagickCore
++ pkg-config --libs MagickCore6
+ ;;
+ *)
+ echo "${usage}" 1>&2
+--- ImageMagick-6.9.7-0/wand/MagickWand-config.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/wand/MagickWand-config.in 2016-12-27 08:38:34.223917467 +0100
+@@ -8,11 +8,11 @@
+ exec_prefix=@exec_prefix@
+
+ usage="\
+-Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
++Usage: MagickWand6-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+- echo "Example: gcc \`MagickWand-config --cflags --cppflags\` -o wand wand.c \`MagickWand-config --ldflags --libs\`" 1>&2
++ echo "Example: gcc \`MagickWand6-config --cflags --cppflags\` -o wand wand.c \`MagickWand6-config --ldflags --libs\`" 1>&2
+ exit 1
+ fi
+
+@@ -38,19 +38,19 @@
+ echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ ;;
+ --cflags)
+- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
++ PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+ ;;
+ --cxxflags)
+- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
++ PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+ ;;
+ --cppflags)
+- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
++ PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand6
+ ;;
+ --ldflags)
+- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
++ PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand6
+ ;;
+ --libs)
+- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
++ PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand6
+ ;;
+ *)
+ echo "${usage}" 1>&2
+--- ImageMagick-6.9.7-0/wand/Wand-config.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/wand/Wand-config.in 2016-12-27 08:39:14.421666371 +0100
+@@ -8,11 +8,11 @@
+ exec_prefix=@exec_prefix@
+
+ usage="\
+-Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
++Usage: Wand6-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+- echo "Example: gcc \`Wand-config --cflags --cppflags\` -o wand wand.c \`Wand-config --ldflags --libs\`" 1>&2
++ echo "Example: gcc \`Wand6-config --cflags --cppflags\` -o wand wand.c \`Wand6-config --ldflags --libs\`" 1>&2
+ exit 1
+ fi
+
+@@ -38,19 +38,19 @@
+ echo '@PACKAGE_VERSION@ Q at QUANTUM_DEPTH@ @MAGICK_HDRI@'
+ ;;
+ --cflags)
+- pkg-config --cflags MagickWand
++ pkg-config --cflags MagickWand6
+ ;;
+ --cxxflags)
+- pkg-config --cflags MagickWand
++ pkg-config --cflags MagickWand6
+ ;;
+ --cppflags)
+- pkg-config --cflags MagickWand
++ pkg-config --cflags MagickWand6
+ ;;
+ --ldflags)
+- pkg-config --libs MagickWand
++ pkg-config --libs MagickWand6
+ ;;
+ --libs)
+- pkg-config --libs MagickWand
++ pkg-config --libs MagickWand6
+ ;;
+ *)
+ echo "${usage}" 1>&2
+--- ImageMagick-6.9.7-0/wand/MagickWand.pc.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/wand/MagickWand.pc.in 2016-12-27 08:45:54.205764162 +0100
+@@ -9,7 +9,7 @@
+ Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
+ URL: https://www.imagemagick.org
+ Version: @PACKAGE_VERSION@
+-Requires: MagickCore
++Requires: MagickCore6
+ Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
+ Libs: -L${libdir} -l${libname}
+ Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
+--- ImageMagick-6.9.7-0/wand/Wand.pc.in~ 2016-12-18 14:34:45.000000000 +0100
++++ ImageMagick-6.9.7-0/wand/Wand.pc.in 2016-12-27 08:46:32.786803064 +0100
+@@ -9,7 +9,7 @@
+ Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
+ URL: https://www.imagemagick.org
+ Version: @PACKAGE_VERSION@
+-Requires: MagickCore
++Requires: MagickCore6
+ Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
+ Libs: -L${libdir} -l${libname}
+ Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/70534de9c8c235e683220a322de05d8e497a1076
More information about the pld-cvs-commit
mailing list