From c7d093fef767ea60eaff568ee4c82f0b1e9f6dd9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 14 Nov 2008 14:54:41 +0000 Subject: [PATCH] - New upstream release 6.4.5-5 - Various specfile fixes from merge review (rh 225897) - Fix building with new libtool (rh 471468) --- .cvsignore | 2 +- ImageMagick-6.3.8-invalid-gerror-use.patch | 22 ++-- ImageMagick-6.4.0-multilib.patch | 42 ++++--- ImageMagick.spec | 140 +++++++++++---------- sources | 2 +- 5 files changed, 111 insertions(+), 97 deletions(-) diff --git a/.cvsignore b/.cvsignore index 10e965f..2e631e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-6.4.0-10.tar.bz2 +ImageMagick-6.4.5-5.tar.bz2 diff --git a/ImageMagick-6.3.8-invalid-gerror-use.patch b/ImageMagick-6.3.8-invalid-gerror-use.patch index 65de108..03f9cd7 100644 --- a/ImageMagick-6.3.8-invalid-gerror-use.patch +++ b/ImageMagick-6.3.8-invalid-gerror-use.patch @@ -1,27 +1,21 @@ -diff -up ImageMagick-6.4.0/coders/svg.c~ ImageMagick-6.4.0/coders/svg.c ---- ImageMagick-6.4.0/coders/svg.c~ 2008-04-26 11:32:26.000000000 +0200 -+++ ImageMagick-6.4.0/coders/svg.c 2008-04-26 11:32:26.000000000 +0200 -@@ -2777,12 +2777,20 @@ static Image *ReadSVGImage(const ImageIn - rsvg_handle_set_dpi_x_y(svg_info, +diff -up ImageMagick-6.4.5/coders/svg.c.orig ImageMagick-6.4.5/coders/svg.c +--- ImageMagick-6.4.5/coders/svg.c.orig 2008-10-10 03:28:08.000000000 +0200 ++++ ImageMagick-6.4.5/coders/svg.c 2008-11-14 13:52:52.000000000 +0100 +@@ -2798,9 +2798,15 @@ static Image *ReadSVGImage(const ImageIn + rsvg_handle_set_dpi_x_y(svg_handle, image->x_resolution == 0.0 ? 72.0 : image->x_resolution, image->y_resolution == 0.0 ? 72.0 : image->y_resolution); - error=(GError *) NULL; - while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) + while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) { + error=(GError *) NULL; - (void) rsvg_handle_write(svg_info,message,n,&error); + (void) rsvg_handle_write(svg_handle,message,n,&error); + if (error != (GError *) NULL) { + /* FIXME actually do something with the error */ + g_error_free(error); + } + } + error=(GError *) NULL; - rsvg_handle_close(svg_info,&error); -- if (error != (GError *) NULL) -+ if (error != (GError *) NULL) { -+ /* FIXME actually do something with the error */ + rsvg_handle_close(svg_handle,&error); + if (error != (GError *) NULL) g_error_free(error); -+ } - #if defined(MAGICKCORE_CAIRO_DELEGATE) - rsvg_handle_get_dimensions(svg_info,&dimension_info); - image->columns=dimension_info.width*image->x_resolution/72.0; diff --git a/ImageMagick-6.4.0-multilib.patch b/ImageMagick-6.4.0-multilib.patch index ce52c54..f4193f8 100644 --- a/ImageMagick-6.4.0-multilib.patch +++ b/ImageMagick-6.4.0-multilib.patch @@ -1,6 +1,6 @@ -diff -up ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in ---- ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ 2008-04-27 16:25:14.000000000 +0200 -+++ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in 2008-04-27 16:25:14.000000000 +0200 +diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.5/Magick++/bin/Magick++-config.in +--- ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib 2008-02-17 19:10:46.000000000 +0100 ++++ ImageMagick-6.4.5/Magick++/bin/Magick++-config.in 2008-11-14 15:19:15.000000000 +0100 @@ -7,8 +7,6 @@ prefix=@prefix@ @@ -35,9 +35,9 @@ diff -up ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ ImageMagick-6.4.0/Ma ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.0/magick/Magick-config.in~ ImageMagick-6.4.0/magick/Magick-config.in ---- ImageMagick-6.4.0/magick/Magick-config.in~ 2008-04-27 16:25:15.000000000 +0200 -+++ ImageMagick-6.4.0/magick/Magick-config.in 2008-04-27 16:25:15.000000000 +0200 +diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/magick/Magick-config.in +--- ImageMagick-6.4.5/magick/Magick-config.in.multilib 2008-04-28 00:35:32.000000000 +0200 ++++ ImageMagick-6.4.5/magick/Magick-config.in 2008-11-14 15:19:15.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -67,14 +67,14 @@ diff -up ImageMagick-6.4.0/magick/Magick-config.in~ ImageMagick-6.4.0/magick/Mag + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickCore" + pkg-config --libs MagickCore ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.0/magick/MagickCore-config.in~ ImageMagick-6.4.0/magick/MagickCore-config.in ---- ImageMagick-6.4.0/magick/MagickCore-config.in~ 2008-04-27 16:25:14.000000000 +0200 -+++ ImageMagick-6.4.0/magick/MagickCore-config.in 2008-04-27 16:25:14.000000000 +0200 +diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4.5/magick/MagickCore-config.in +--- ImageMagick-6.4.5/magick/MagickCore-config.in.multilib 2008-08-16 19:34:36.000000000 +0200 ++++ ImageMagick-6.4.5/magick/MagickCore-config.in 2008-11-14 15:42:54.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -84,7 +84,7 @@ diff -up ImageMagick-6.4.0/magick/MagickCore-config.in~ ImageMagick-6.4.0/magick usage="\ Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" -@@ -40,19 +38,19 @@ while test $# -gt 0; do +@@ -40,25 +38,19 @@ while test $# -gt 0; do echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' ;; --cflags) @@ -104,14 +104,20 @@ diff -up ImageMagick-6.4.0/magick/MagickCore-config.in~ ImageMagick-6.4.0/magick + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickCore" +- ;; +- --coder-path) +- echo "@CODER_PATH@" +- ;; +- --filter-path) +- echo "@FILTER_PATH@" + pkg-config --libs MagickCore ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.0/wand/MagickWand-config.in~ ImageMagick-6.4.0/wand/MagickWand-config.in ---- ImageMagick-6.4.0/wand/MagickWand-config.in~ 2008-04-27 16:25:15.000000000 +0200 -+++ ImageMagick-6.4.0/wand/MagickWand-config.in 2008-04-27 16:25:15.000000000 +0200 +diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/wand/MagickWand-config.in +--- ImageMagick-6.4.5/wand/MagickWand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 ++++ ImageMagick-6.4.5/wand/MagickWand-config.in 2008-11-14 15:19:15.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -146,9 +152,9 @@ diff -up ImageMagick-6.4.0/wand/MagickWand-config.in~ ImageMagick-6.4.0/wand/Mag ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.0/wand/Wand-config.in~ ImageMagick-6.4.0/wand/Wand-config.in ---- ImageMagick-6.4.0/wand/Wand-config.in~ 2008-04-27 16:25:15.000000000 +0200 -+++ ImageMagick-6.4.0/wand/Wand-config.in 2008-04-27 16:25:15.000000000 +0200 +diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/Wand-config.in +--- ImageMagick-6.4.5/wand/Wand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 ++++ ImageMagick-6.4.5/wand/Wand-config.in 2008-11-14 15:19:15.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ diff --git a/ImageMagick.spec b/ImageMagick.spec index 3cfb9eb..327d550 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,38 +1,24 @@ -# ImageMagick has adopted a new Version.Patchlevel version numbering system... -# 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 6.4.0 -%define Patchlevel 10 -Summary: An X application for displaying and manipulating images -Name: ImageMagick -%if 0%{?Patchlevel} -Version: %{VER}.%{Patchlevel} -%else -Version: %{VER} -%endif -Release: 3%{?dist} -License: ImageMagick -Group: Applications/Multimedia -%if 0%{?Patchlevel} -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 -%else -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 -%endif -Source1: magick_small.png -Patch1: ImageMagick-6.4.0-multilib.patch -Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch -Patch3: ImageMagick-6.4.0-xdg-open.patch - -Url: http://www.imagemagick.org/ -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl -BuildRequires: freetype-devel >= 2.1 -BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 -BuildRequires: ghostscript-devel -BuildRequires: perl-devel, perl(ExtUtils::MakeMaker) -BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel -BuildRequires: libX11-devel, libXext-devel, libXt-devel -BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel +%define VER 6.4.5 +%define Patchlevel 5 + +Name: ImageMagick +Version: %{VER}.%{Patchlevel} +Release: 1%{?dist} +Summary: An X application for displaying and manipulating images +Group: Applications/Multimedia +License: ImageMagick +Url: http://www.imagemagick.org/ +Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 +Patch1: ImageMagick-6.4.0-multilib.patch +Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch + +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 +BuildRequires: ghostscript-devel +BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel %description ImageMagick(TM) is an image display and manipulation tool for the X @@ -49,6 +35,7 @@ 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 app development Group: Development/Libraries @@ -73,6 +60,18 @@ APIs, you need to install ImageMagick-devel as well as ImageMagick. You do not need to install it if you just want to use ImageMagick, however. + +%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. +Note this documentation can also be found on the ImageMagick website: +http://www.imagemagick.org/ + + %package perl Summary: ImageMagick perl bindings Group: System Environment/Libraries @@ -85,6 +84,7 @@ Perl bindings to ImageMagick. Install ImageMagick-perl if you want to use any perl scripts that use ImageMagick. + %package c++ Summary: ImageMagick Magick++ library (C++ bindings) Group: System Environment/Libraries @@ -96,6 +96,7 @@ graphics manipulation library. Install ImageMagick-c++ if you want to use any applications that use Magick++. + %package c++-devel Summary: C++ bindings for the ImageMagick library Group: Development/Libraries @@ -119,14 +120,18 @@ however. %setup -q -n %{name}-%{VER} %patch1 -p1 -b .multilib %patch2 -p1 -%patch3 -p1 +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 +mkdir Magick++/examples +cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples %build %configure --enable-shared \ + --disable-static \ --with-modules \ --with-perl \ --with-x \ @@ -145,25 +150,28 @@ mv README.txt.tmp README.txt # Disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +rm $RPM_BUILD_ROOT%{_libdir}/*.la + # fix weird perl Magick.so permissions chmod 755 $RPM_BUILD_ROOT%{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 # perlmagick: build files list -echo "%defattr(-,root,root)" > perl-pkg-files +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 \ @@ -175,12 +183,8 @@ if [ -z perl-pkg-files ] ; then exit -1 fi -rm -rf $RPM_BUILD_ROOT%{_libdir}/ImageMagick -# Keep config -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/[a-b,d-z,A-Z]* -rm -rf $RPM_BUILD_ROOT%{_libdir}/libltdl.* -rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} +# These don't belong here, we include them in %%doc +rm $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/{ChangeLog,LICENSE,NEWS.txt} # fix multilib issues %ifarch x86_64 s390x ia64 ppc64 alpha sparc64 @@ -189,10 +193,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h \ - $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config-%{wordsize}.h +mv $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h \ + $RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h <$RPM_BUILD_ROOT%{_includedir}/%{name}/magick/magick-config.h < 6.4.5.5-1 +- New upstream release 6.4.5-5 +- Various specfile fixes from merge review (rh 225897) +- Fix building with new libtool (rh 471468) + * Thu Nov 13 2008 Hans de Goede 6.4.0.10-3 - Rebuild for new libtool (rh 471468) diff --git a/sources b/sources index eeadbf9..af883b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c6215e0ac8468356255e9aefbc9fe94 ImageMagick-6.4.0-10.tar.bz2 +c6a8c0b8ddc7c9310429d7e168dd6eba ImageMagick-6.4.5-5.tar.bz2