(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index df897e62e11d736b5e9da510f862d047d480bda8..5ca7c67b0de4fc58d89cd24d1236cdc2f0f90eea 100644 (file)
--- 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 <<EOF
+cat >%{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h <<EOF
 #ifndef IMAGEMAGICK_MULTILIB
 #define IMAGEMAGICK_MULTILIB
 
@@ -234,8 +218,14 @@ cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <<EOF
 #endif
 EOF
 
+# Fonts must be packaged separately. It does nothave matter and demos work without it.
+rm PerlMagick/demo/Generic.ttf
+
+# From version around 6.7.5-6 docs go to unversioned dir. Fixing
+mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}/%{_datadir}/doc/%{name}-%{VERSION}
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -251,27 +241,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc QuickStart.txt ChangeLog Platforms.txt
 %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
-%{_libdir}/libMagickCore.so*
-%{_libdir}/libMagickWand.so*
-%{_libdir}/%{name}-%{VERSION}
+%{_libdir}/libMagickCore.so.5*
+%{_libdir}/libMagickWand.so.5*
 %{_bindir}/[a-z]*
-%{_sysconfdir}/%{name}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-zA-Z]*
+%{_mandir}/man[145]/[a-z]*
 %{_mandir}/man1/%{name}.*
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
-
+%{_sysconfdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/MagickCore-config
 %{_bindir}/MagickWand-config
-%{_libdir}/libMagickCore.so*
-%{_libdir}/libMagickWand.so*
+%{_libdir}/libMagickCore.so
+%{_libdir}/libMagickWand.so
 %{_libdir}/pkgconfig/MagickCore.pc
 %{_libdir}/pkgconfig/ImageMagick.pc
 %{_libdir}/pkgconfig/MagickWand.pc
+%{_libdir}/pkgconfig/Wand.pc
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/MagickCore
 %{_includedir}/%{name}/MagickWand
@@ -280,18 +269,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files djvu
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.*
+%{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/%{name}-%{VERSION}
 %doc LICENSE
 
 %files c++
 %defattr(-,root,root,-)
 %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
 %doc www/Magick++/COPYING
-%{_libdir}/libMagick++.so*
+%{_libdir}/libMagick++.so.5*
 
 %files c++-devel
 %defattr(-,root,root,-)
@@ -299,7 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Magick++-config
 %{_includedir}/%{name}/Magick++
 %{_includedir}/%{name}/Magick++.h
-%{_libdir}/libMagick++.so*
+%{_libdir}/libMagick++.so
 %{_libdir}/pkgconfig/Magick++.pc
 %{_libdir}/pkgconfig/ImageMagick++.pc
 %{_mandir}/man1/Magick++-config.*
@@ -309,7 +298,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
-
 %changelog
 * Sun May 01 2005 Cristy <cristy@mystic.es.dupont.com> 1.0-0
 -  Port of Redhat's RPM script to support ImageMagick.

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index 65b039e0cf23fbcf794182b779562d71446f8070..f14b79edb0ea39cc0c7dc23cf90f7728d0d273d8 100644 (file)
--- 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 <<EOF
+cat >%{buildroot}%{_includedir}/%{name}/MagickCore/magick-config.h <<EOF
 #ifndef IMAGEMAGICK_MULTILIB
 #define IMAGEMAGICK_MULTILIB
 
@@ -234,8 +218,14 @@ cat >$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h <<EOF
 #endif
 EOF
 
+# Fonts must be packaged separately. It does nothave matter and demos work without it.
+rm PerlMagick/demo/Generic.ttf
+
+# From version around 6.7.5-6 docs go to unversioned dir. Fixing
+mv %{buildroot}/%{_datadir}/doc/%{name} %{buildroot}/%{_datadir}/doc/%{name}-%{VERSION}
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -251,27 +241,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc QuickStart.txt ChangeLog Platforms.txt
 %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
-%{_libdir}/libMagickCore.so*
-%{_libdir}/libMagickWand.so*
-%{_libdir}/%{name}-%{VERSION}
+%{_libdir}/libMagickCore.so.5*
+%{_libdir}/libMagickWand.so.5*
 %{_bindir}/[a-z]*
-%{_sysconfdir}/%{name}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-zA-Z]*
+%{_mandir}/man[145]/[a-z]*
 %{_mandir}/man1/%{name}.*
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
-
+%{_sysconfdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/MagickCore-config
 %{_bindir}/MagickWand-config
-%{_libdir}/libMagickCore.so*
-%{_libdir}/libMagickWand.so*
+%{_libdir}/libMagickCore.so
+%{_libdir}/libMagickWand.so
 %{_libdir}/pkgconfig/MagickCore.pc
 %{_libdir}/pkgconfig/ImageMagick.pc
 %{_libdir}/pkgconfig/MagickWand.pc
+%{_libdir}/pkgconfig/Wand.pc
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/MagickCore
 %{_includedir}/%{name}/MagickWand
@@ -280,18 +269,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files djvu
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%{version}/modules-Q16/coders/djvu.*
+%{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/%{name}-%{VERSION}
 %doc LICENSE
 
 %files c++
 %defattr(-,root,root,-)
 %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
 %doc www/Magick++/COPYING
-%{_libdir}/libMagick++.so*
+%{_libdir}/libMagick++.so.5*
 
 %files c++-devel
 %defattr(-,root,root,-)
@@ -299,7 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Magick++-config
 %{_includedir}/%{name}/Magick++
 %{_includedir}/%{name}/Magick++.h
-%{_libdir}/libMagick++.so*
+%{_libdir}/libMagick++.so
 %{_libdir}/pkgconfig/Magick++.pc
 %{_libdir}/pkgconfig/ImageMagick++.pc
 %{_mandir}/man1/Magick++-config.*
@@ -309,7 +298,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
-
 %changelog
 * Sun May 01 2005 Cristy <cristy@mystic.es.dupont.com> 1.0-0
 -  Port of Redhat's RPM script to support ImageMagick.

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index d114f0236d9be05765149c87fed89a782cc2e5c6..c0a244836f6b130bc76bd4d7a45d3deee3cccdb2 100644 (file)
--- 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 951654e08da753ec16cc83a819bf3d87aac07bde..b19cfb0c8a5b101fca68622ea413ce554ec1e855 100644 (file)
--- 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 5501adc8d29cd659e1b0e3c6c600e5ffc80707a1..3f2c71344fdf4fd56cac1f6d6b2a82f64a4997bb 100644 (file)
--- 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 a09741921e4eb0dfb004bfbf19448c8af63bce05..06102d4ee3d8597e01c2423244d7d46e4cdb6357 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-03-03</created>
+    <created>2012-03-05</created>
 
     <description xml:lang="en">
 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
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-03-03</created>
+          <created>2012-03-05</created>
           <revision>7.0.0</revision>
       </Version>
     </release>

diff --git a/config/configure.xml b/config/configure.xml
index 82a0cc8bb763b1bbdefed9946befcf36e4672c1f..bf688333fefbf539ac642392f029dd1a5d34a251 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,9 +10,9 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="7038" />
-  <configure name="RELEASE_DATE" value="2012-03-03"/>
-  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
+  <configure name="SVN_REVISION" value="7053" />
+  <configure name="RELEASE_DATE" value="2012-03-05"/>
+  <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick"/>

diff --git a/configure b/configure
index 6f37d263b7ccb0cc058720dcbeee124a53428921..07e88e9995c8e585d931d92fb13ad3fc60a2f1c2 100755 (executable)
--- 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