From: cristy Date: Tue, 6 Mar 2012 01:12:58 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6077 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abb241b3d419fe90ca79a1f5574b10194b341922;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index df897e62e..5ca7c67b0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,56 +1,41 @@ %global VERSION 7.0.0 %global Patchlevel 0 -Name: ImageMagick -Version: %{VERSION} -Release: %{Patchlevel} -Summary: Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images. -Group: Applications/Multimedia -License: http://www.imagemagick.org/script/license.php -Url: http://www.imagemagick.org/ -Source0: http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 -BuildRequires: ghostscript-devel, djvulibre-devel -BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel -BuildRequires: libX11-devel, libXext-devel, libXt-devel -BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel +Name: ImageMagick +Version: %{VERSION}.%{Patchlevel} +Release: 3%{?dist} +Summary: Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images. +Group: Applications/Multimedia +License: http://www.imagemagick.org/script/license.php +Url: http://www.imagemagick.org/ +Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel +BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 +BuildRequires: ghostscript-devel, djvulibre-devel +BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel %description -ImageMagick is a software suite to create, edit, and compose bitmap images. It -can read, convert and write images in a variety of formats (about 100) -including DPX, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, -and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear -and transform images, adjust image colors, apply various special effects, -or draw text, lines, polygons, ellipses and Bézier curves. - -The functionality of ImageMagick is typically utilized from the command line -or you can use the features from programs written in your favorite programming -language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand -(C), ChMagick (Ch), Magick++ (C++), JMagick (Java), L-Magick (Lisp), nMagick -(Neko/haXe), PascalMagick (Pascal), PerlMagick (Perl), MagickWand for PHP -(PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a -language interface, use ImageMagick to modify or create images automagically -and dynamically. - -ImageMagick is free software delivered as a ready-to-run binary distribution -or as source code that you may freely use, copy, modify, and distribute in -both open and proprietary applications. It is distributed under an Apache -2.0-style license, approved by the OSI. - -The ImageMagick development process ensures a stable API and ABI. Before -each ImageMagick release, we perform a comprehensive security assessment that -includes memory and thread error detection to help prevent exploits.ImageMagick -is free software delivered as a ready-to-run binary distribution or as source -code that you may freely use, copy, modify, and distribute in both open and -proprietary applications. It is distributed under an Apache 2.0-style license, -approved by the OSI. +ImageMagick is an image display and manipulation tool for the X +Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, +and Photo CD image formats. It can resize, rotate, sharpen, color +reduce, or add special effects to an image, and when finished you can +either save the completed work in the original format or a different +one. ImageMagick also includes command line programs for creating +animated or transparent .gifs, creating composite images, creating +thumbnail images, and more. + +ImageMagick is one of your choices if you need a program to manipulate +and display images. If you want to develop your own applications +which use ImageMagick code or APIs, you need to install +ImageMagick-devel as well. %package devel -Summary: Library links and header files for ImageMagick application development +Summary: Library links and header files for ImageMagick app development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libX11-devel, libXext-devel, libXt-devel @@ -74,11 +59,6 @@ You do not need to install it if you just want to use ImageMagick, however. -%package doc -Summary: ImageMagick HTML documentation -Group: Documentation - - %package djvu Summary: DjVu plugin for ImageMagick Group: Applications/Multimedia @@ -89,11 +69,15 @@ This packages contains a plugin for ImageMagick which makes it possible to save and load DjvU files from ImageMagick and libMagickCore using applications. +%package doc +Summary: ImageMagick html documentation +Group: Documentation + %description doc ImageMagick documentation, this package contains usage (for the -commandline tools) and API (for the libraries) documentation in HTML format. +commandline tools) and API (for the libraries) documentation in html format. Note this documentation can also be found on the ImageMagick website: -http://www.imagemagick.org/. +http://www.imagemagick.org/ %package perl @@ -102,7 +86,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description perl Perl bindings to ImageMagick. @@ -136,7 +119,6 @@ ImageMagick is an image manipulation program. If you want to create applications that will use Magick++ code or APIs, you'll need to install ImageMagick-c++-devel, ImageMagick-devel and ImageMagick. - You don't need to install it if you just want to use ImageMagick, or if you want to develop/compile applications using the ImageMagick C interface, however. @@ -148,10 +130,11 @@ sed -i 's/libltdl.la/libltdl.so/g' configure iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp touch -r README.txt README.txt.tmp mv README.txt.tmp README.txt -# for %%doc +# for %doc mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples + %build %configure --enable-shared \ --disable-static \ @@ -165,7 +148,7 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples --with-lcms \ --with-rsvg \ --with-xml \ - --with-perl-options='INSTALLDIRS=vendor' \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/MagickCore/.libs' LDDLFLAGS='-shared -L$PWD/MagickCore/.libs'" \ --without-dps \ --without-included-ltdl --with-ltdl-include=%{_includedir} \ --with-ltdl-lib=%{_libdir} @@ -177,29 +160,30 @@ make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name} -rm $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} INSTALL="install -p" +cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} +# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! +rm %{buildroot}%{_libdir}/*.la # fix weird perl Magick.so permissions -chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so +chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl # perlmagick: cleanup various perl tempfiles from the build which get installed -find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f -find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f -find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f +find %{buildroot} -name "*.bs" |xargs rm -f +find %{buildroot} -name ".packlist" |xargs rm -f +find %{buildroot} -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root,-)" > perl-pkg-files -find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ - | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files -find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ - | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ +find %{buildroot}/%{_libdir}/perl* -type f -print \ + | sed "s@^%{buildroot}@@g" > perl-pkg-files +find %{buildroot}%{perl_vendorarch} -type d -print \ + | sed "s@^%{buildroot}@%dir @g" \ | grep -v '^%dir %{perl_vendorarch}$' \ | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then @@ -214,10 +198,10 @@ fi %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ - $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h +mv %{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h \ + %{buildroot}%{_includedir}/%{name}/MagickCore/magick-config-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <%{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h <$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h < 1.0-0 - Port of Redhat's RPM script to support ImageMagick. diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index 65b039e0c..f14b79edb 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -1,56 +1,41 @@ %global VERSION @PACKAGE_VERSION@ %global Patchlevel @PACKAGE_RELEASE@ -Name: @PACKAGE_NAME@ -Version: %{VERSION} -Release: %{Patchlevel} -Summary: Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images. -Group: Applications/Multimedia -License: http://www.imagemagick.org/script/license.php -Url: http://www.imagemagick.org/ -Source0: http://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 -BuildRequires: ghostscript-devel, djvulibre-devel -BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel -BuildRequires: libX11-devel, libXext-devel, libXt-devel -BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel +Name: @PACKAGE_NAME@ +Version: %{VERSION}.%{Patchlevel} +Release: 3%{?dist} +Summary: Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images. +Group: Applications/Multimedia +License: http://www.imagemagick.org/script/license.php +Url: http://www.imagemagick.org/ +Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.xz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel +BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 +BuildRequires: ghostscript-devel, djvulibre-devel +BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel %description -ImageMagick is a software suite to create, edit, and compose bitmap images. It -can read, convert and write images in a variety of formats (about 100) -including DPX, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, -and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear -and transform images, adjust image colors, apply various special effects, -or draw text, lines, polygons, ellipses and Bézier curves. - -The functionality of ImageMagick is typically utilized from the command line -or you can use the features from programs written in your favorite programming -language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand -(C), ChMagick (Ch), Magick++ (C++), JMagick (Java), L-Magick (Lisp), nMagick -(Neko/haXe), PascalMagick (Pascal), PerlMagick (Perl), MagickWand for PHP -(PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a -language interface, use ImageMagick to modify or create images automagically -and dynamically. - -ImageMagick is free software delivered as a ready-to-run binary distribution -or as source code that you may freely use, copy, modify, and distribute in -both open and proprietary applications. It is distributed under an Apache -2.0-style license, approved by the OSI. - -The ImageMagick development process ensures a stable API and ABI. Before -each ImageMagick release, we perform a comprehensive security assessment that -includes memory and thread error detection to help prevent exploits.ImageMagick -is free software delivered as a ready-to-run binary distribution or as source -code that you may freely use, copy, modify, and distribute in both open and -proprietary applications. It is distributed under an Apache 2.0-style license, -approved by the OSI. +ImageMagick is an image display and manipulation tool for the X +Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF, +and Photo CD image formats. It can resize, rotate, sharpen, color +reduce, or add special effects to an image, and when finished you can +either save the completed work in the original format or a different +one. ImageMagick also includes command line programs for creating +animated or transparent .gifs, creating composite images, creating +thumbnail images, and more. + +ImageMagick is one of your choices if you need a program to manipulate +and display images. If you want to develop your own applications +which use ImageMagick code or APIs, you need to install +ImageMagick-devel as well. %package devel -Summary: Library links and header files for ImageMagick application development +Summary: Library links and header files for ImageMagick app development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libX11-devel, libXext-devel, libXt-devel @@ -74,11 +59,6 @@ You do not need to install it if you just want to use ImageMagick, however. -%package doc -Summary: ImageMagick HTML documentation -Group: Documentation - - %package djvu Summary: DjVu plugin for ImageMagick Group: Applications/Multimedia @@ -89,11 +69,15 @@ This packages contains a plugin for ImageMagick which makes it possible to save and load DjvU files from ImageMagick and libMagickCore using applications. +%package doc +Summary: ImageMagick html documentation +Group: Documentation + %description doc ImageMagick documentation, this package contains usage (for the -commandline tools) and API (for the libraries) documentation in HTML format. +commandline tools) and API (for the libraries) documentation in html format. Note this documentation can also be found on the ImageMagick website: -http://www.imagemagick.org/. +http://www.imagemagick.org/ %package perl @@ -102,7 +86,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - %description perl Perl bindings to ImageMagick. @@ -136,7 +119,6 @@ ImageMagick is an image manipulation program. If you want to create applications that will use Magick++ code or APIs, you'll need to install ImageMagick-c++-devel, ImageMagick-devel and ImageMagick. - You don't need to install it if you just want to use ImageMagick, or if you want to develop/compile applications using the ImageMagick C interface, however. @@ -148,10 +130,11 @@ sed -i 's/libltdl.la/libltdl.so/g' configure iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp touch -r README.txt README.txt.tmp mv README.txt.tmp README.txt -# for %%doc +# for %doc mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples + %build %configure --enable-shared \ --disable-static \ @@ -165,7 +148,7 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples --with-lcms \ --with-rsvg \ --with-xml \ - --with-perl-options='INSTALLDIRS=vendor' \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/MagickCore/.libs' LDDLFLAGS='-shared -L$PWD/MagickCore/.libs'" \ --without-dps \ --without-included-ltdl --with-ltdl-include=%{_includedir} \ --with-ltdl-lib=%{_libdir} @@ -177,29 +160,30 @@ make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name} -rm $RPM_BUILD_ROOT%{_libdir}/*.la +make install DESTDIR=%{buildroot} INSTALL="install -p" +cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} +# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! +rm %{buildroot}%{_libdir}/*.la # fix weird perl Magick.so permissions -chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so +chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl # perlmagick: cleanup various perl tempfiles from the build which get installed -find $RPM_BUILD_ROOT -name "*.bs" |xargs rm -f -find $RPM_BUILD_ROOT -name ".packlist" |xargs rm -f -find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f +find %{buildroot} -name "*.bs" |xargs rm -f +find %{buildroot} -name ".packlist" |xargs rm -f +find %{buildroot} -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root,-)" > perl-pkg-files -find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ - | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files -find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ - | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ +find %{buildroot}/%{_libdir}/perl* -type f -print \ + | sed "s@^%{buildroot}@@g" > perl-pkg-files +find %{buildroot}%{perl_vendorarch} -type d -print \ + | sed "s@^%{buildroot}@%dir @g" \ | grep -v '^%dir %{perl_vendorarch}$' \ | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then @@ -214,10 +198,10 @@ fi %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ - $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h +mv %{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h \ + %{buildroot}%{_includedir}/%{name}/MagickCore/magick-config-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <%{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h <$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h < 1.0-0 - Port of Redhat's RPM script to support ImageMagick. diff --git a/MagickCore/channel.c b/MagickCore/channel.c index d114f0236..c0a244836 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -288,7 +288,7 @@ MagickExport Image *ChannelOperationImage(const Image *image, if (i < 0) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","`%s'",p); + "UnrecognizedChannelType","`%s'",token); destination_image=DestroyImageList(destination_image); break; } @@ -314,7 +314,7 @@ MagickExport Image *ChannelOperationImage(const Image *image, if (i < 0) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","`%s'",p); + "UnrecognizedChannelType","`%s'",token); destination_image=DestroyImageList(destination_image); break; } diff --git a/MagickCore/option.c b/MagickCore/option.c index 951654e08..b19cfb0c8 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -2539,7 +2539,7 @@ MagickExport ssize_t ParsePixelChannelOption(const char *channels) return(channel); q=(char *) token; channel=InterpretLocaleValue(token,&q); - if ((q == channels) || (channel < 0) || (channel >= MaxPixelChannels)) + if ((q == token) || (channel < 0) || (channel >= MaxPixelChannels)) return(-1); return(channel); } diff --git a/MagickCore/version.h b/MagickCore/version.h index 5501adc8d..3f2c71344 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "7038" +#define MagickSVNRevision "7053" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-03-03" +#define MagickReleaseDate "2012-03-05" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index a09741921..06102d4ee 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-03 + 2012-03-05 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-03-03 + 2012-03-05 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 82a0cc8bb..bf688333f 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,9 +10,9 @@ - - - + + + diff --git a/configure b/configure index 6f37d263b..07e88e999 100755 --- a/configure +++ b/configure @@ -3616,7 +3616,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=7038 +MAGICK_SVN_REVISION=7053