From 15bc0d69cbb71ae6839b49361de19e0fd56985d9 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 17 Dec 2015 12:36:54 -0500 Subject: [PATCH] Update RPM spec so an IMv7 RPM can build --- ImageMagick.spec.in | 30 ++++++++++++++---------------- PerlMagick/quantum/quantum.pm | 2 +- coders/icon.c | 2 +- config/configure.xml | 32 ++++++++++++++++---------------- utilities/ImageMagick.1 | 4 ++-- utilities/animate.1 | 4 ++-- utilities/compare.1 | 4 ++-- utilities/composite.1 | 4 ++-- utilities/conjure.1 | 4 ++-- utilities/convert.1 | 4 ++-- utilities/display.1 | 4 ++-- utilities/identify.1 | 4 ++-- utilities/import.1 | 4 ++-- utilities/mogrify.1 | 4 ++-- utilities/montage.1 | 4 ++-- utilities/stream.1 | 4 ++-- 16 files changed, 56 insertions(+), 58 deletions(-) diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index cd91bd567..93a4999b5 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -218,28 +218,26 @@ rm -rf %{buildroot} %files libs %defattr(-,root,root,-) %doc LICENSE NOTICE AUTHORS.txt QuickStart.txt -%{_libdir}/libMagickCore-7.Q16.so.* -%{_libdir}/libMagickWand-7.Q16.so.* +%{_libdir}/libMagickCore-7.Q16HDRI.so.* +%{_libdir}/libMagickWand-7.Q16HDRI.so.* %{_libdir}/%{name}-%{VERSION} %{_datadir}/%{name}-7 -%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* +%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16HDRI/coders/djvu.* %{_sysconfdir}/%{name}-7 %files devel %defattr(-,root,root,-) %{_bindir}/MagickCore-config -%{_bindir}/Magick-config %{_bindir}/MagickWand-config -%{_bindir}/Wand-config -%{_libdir}/libMagickCore-7.Q16.so -%{_libdir}/libMagickWand-7.Q16.so +%{_libdir}/libMagickCore-7.Q16HDRI.so +%{_libdir}/libMagickWand-7.Q16HDRI.so %{_libdir}/pkgconfig/MagickCore.pc -%{_libdir}/pkgconfig/MagickCore-7.Q16.pc +%{_libdir}/pkgconfig/MagickCore-7.Q16HDRI.pc %{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-7.Q16.pc +%{_libdir}/pkgconfig/ImageMagick-7.Q16HDRI.pc %{_libdir}/pkgconfig/MagickWand.pc -%{_libdir}/pkgconfig/MagickWand-7.Q16.pc -%dir %{_includedir}/%{name}-6 +%{_libdir}/pkgconfig/MagickWand-7.Q16HDRI.pc +%dir %{_includedir}/%{name}-7 %{_includedir}/%{name}-7/MagickCore %{_includedir}/%{name}-7/MagickWand %{_mandir}/man1/MagickCore-config.* @@ -247,7 +245,7 @@ rm -rf %{buildroot} %files djvu %defattr(-,root,root,-) -%{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.* +%{_libdir}/%{name}-%{VERSION}/modules-Q16HDRI/coders/djvu.* %files doc %defattr(-,root,root,-) @@ -259,7 +257,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README %doc www/Magick++/COPYING -%{_libdir}/libMagick++-7.Q16.so.* +%{_libdir}/libMagick++-7.Q16HDRI.so.* %files c++-devel %defattr(-,root,root,-) @@ -267,11 +265,11 @@ rm -rf %{buildroot} %{_bindir}/Magick++-config %{_includedir}/%{name}-7/Magick++ %{_includedir}/%{name}-7/Magick++.h -%{_libdir}/libMagick++-7.Q16.so +%{_libdir}/libMagick++-7.Q16HDRI.so %{_libdir}/pkgconfig/Magick++.pc -%{_libdir}/pkgconfig/Magick++-7.Q16.pc +%{_libdir}/pkgconfig/Magick++-7.Q16HDRI.pc %{_libdir}/pkgconfig/ImageMagick++.pc -%{_libdir}/pkgconfig/ImageMagick++-7.Q16.pc +%{_libdir}/pkgconfig/ImageMagick++-7.Q16HDRI.pc %{_mandir}/man1/Magick++-config.* %files perl -f perl-pkg-files diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index 4e9aa935c..5564b4ab4 100644 --- a/PerlMagick/quantum/quantum.pm +++ b/PerlMagick/quantum/quantum.pm @@ -122,7 +122,7 @@ It was originally developed to be used by CGI scripts for Web pages. A web page has been set up for this extension. See: - file:///usr/local/share/doc/ImageMagick-7/www/perl-magick.html + file:///usr/share/doc/ImageMagick-7/www/perl-magick.html http://www.imagemagick.org/script/perl-magick.php If you have problems, go to diff --git a/coders/icon.c b/coders/icon.c index bd9f6cfef..11307abe9 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -988,7 +988,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, png=(unsigned char *) ImageToBlob(write_info,write_image,&length, exception); - write_image=DestroyImage(write_image); + write_image=DestroyImageList(write_image); write_info=DestroyImageInfo(write_info); if (png == (unsigned char *) NULL) { diff --git a/config/configure.xml b/config/configure.xml index de49040dc..60aee9277 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,35 +8,35 @@ - - - + + + - + - + - - - + + + - + - - - - + + + + - + - - + + diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 38ea0b284..6b4b59fb5 100644 --- a/utilities/ImageMagick.1 +++ b/utilities/ImageMagick.1 @@ -86,9 +86,9 @@ saves any visible window on an X server and outputs it as an image file. You can interprets and executes scripts written in the Magick Scripting Language (MSL). .PP -For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. .SH SEE ALSO convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index 6a5b371c8..cfa674054 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server. .SH OVERVIEW The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server. -For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. +For more information about the animate command, point your browser to file:///usr/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -98,4 +98,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index 53596f5bc..f7bd8c244 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image .SH OVERVIEW The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction. -For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. +For more information about the compare command, point your browser to file:///usr/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index f4ca21455..dd094d436 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -7,7 +7,7 @@ composite \- overlaps one image over another. .SH OVERVIEW The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another. -For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. +For more information about the composite command, point your browser to file:///usr/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. .SH DESCRIPTION Image Settings: \-affine matrix affine transform matrix @@ -113,4 +113,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index f14ebd4b1..37acb8b52 100644 --- a/utilities/conjure.1 +++ b/utilities/conjure.1 @@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu .SH OVERVIEW The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. -For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php. +For more information about the conjure command, point your browser to file:///usr/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php. .SH DESCRIPTION Image Settings: \-monitor monitor progress @@ -31,4 +31,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index 480f0dc06..5e1e6ba60 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop, .SH OVERVIEW The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. -For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. +For more information about the convert command, point your browser to file:///usr/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -321,4 +321,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index b11476584..c7d2619fb 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server. .SH OVERVIEW The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server. -For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. +For more information about the display command, point your browser to file:///usr/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -136,4 +136,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index 92df22f94..90f491850 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files. .SH OVERVIEW The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. -For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. +For more information about the identify command, point your browser to file:///usr/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index 1e71fb6b1..bf8a977a4 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil .SH OVERVIEW The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. -For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php. +For more information about the import command, point your browser to file:///usr/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -96,4 +96,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 3afd8ba77..635e51eeb 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, .SH OVERVIEW The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. -For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. +For more information about the mogrify command, point your browser to file:///usr/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -319,4 +319,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index 5173fd755..703659b8f 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im .SH OVERVIEW The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. -For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php. +For more information about the montage command, point your browser to file:///usr/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -142,4 +142,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index 0d362be53..7cbc88318 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image .SH OVERVIEW \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. -For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php. +For more information about the stream command, point your browser to file:///usr/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -56,4 +56,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP -- 2.40.0