diff --git a/.cvsignore b/.cvsignore index 33bf4b6..0d95788 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-5.4.3-11.tar.bz2 +ImageMagick-5.4.7.tar.bz2 diff --git a/ImageMagick-5.4.7-localdoc.patch b/ImageMagick-5.4.7-localdoc.patch new file mode 100644 index 0000000..7c5c6ff --- /dev/null +++ b/ImageMagick-5.4.7-localdoc.patch @@ -0,0 +1,33 @@ +--- ImageMagick-5.4.7/magick/animate.c.ImageMagick 2002-06-10 21:14:57.000000000 -0400 ++++ ImageMagick-5.4.7/magick/animate.c 2002-07-01 08:17:32.000000000 -0400 +@@ -332,7 +332,7 @@ + Display documentation using Netscape remote control. + */ + FormatString(command,"openURL(%.1024s,new-window,noraise)", +- "http://www.imagemagick.org/"); ++ "/usr/X11R6/share/ImageMagick/ImageMagick.html"); + mozilla_atom=XInternAtom(display,"_MOZILLA_COMMAND",False); + (void) XChangeProperty(display,mozilla_window,mozilla_atom, + XA_STRING,8,PropModeReplace,(unsigned char *) command, +--- ImageMagick-5.4.7/magick/display.c.ImageMagick 2002-06-10 21:14:57.000000000 -0400 ++++ ImageMagick-5.4.7/magick/display.c 2002-07-01 08:17:32.000000000 -0400 +@@ -6966,7 +6966,7 @@ + Display documentation using Netscape remote control. + */ + FormatString(command,"openURL(%.1024s,new-window,noraise)", +- "http://www.imagemagick.org/"); ++ "/usr/X11R6/share/ImageMagick/ImageMagick.html"); + mozilla_atom=XInternAtom(display,"_MOZILLA_COMMAND",False); + (void) XChangeProperty(display,mozilla_window,mozilla_atom,XA_STRING, + 8,PropModeReplace,(unsigned char *) command,(int) strlen(command)); +--- ImageMagick-5.4.7/configure.ac.ImageMagick 2002-06-30 15:18:18.000000000 -0400 ++++ ImageMagick-5.4.7/configure.ac 2002-07-01 08:20:59.000000000 -0400 +@@ -1587,7 +1587,7 @@ + # Default delegate definitions + AutotraceDecodeDelegateDefault='autotrace' + BZIPDelegateDefault='bzip2' +-BrowseDelegateDefault='netscape' ++BrowseDelegateDefault='htmlview' + CGMDecodeDelegateDefault='ralcgm' + CatDelegateDefault='cat' + ConvertDelegateDefault='convert' diff --git a/ImageMagick.spec b/ImageMagick.spec index 657b0c6..727e776 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ # ImageMagick has adopted a new Version.Patchlevel version numbering system... # 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 5.4.3 -%define Patchlevel 11 +%define VER 5.4.7 +%define Patchlevel %{nil} Summary: An X application for displaying and manipulating images. Name: ImageMagick %if "%{Patchlevel}" != "" @@ -9,20 +9,21 @@ Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 1 +Release: 4 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" -Source: ftp://ftp.cdrom.com/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 %else -Source: ftp://ftp.cdrom.com/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.bz2 %endif Source1: magick_small.png Patch1: ImageMagick-5.3.5-lprhack.patch Patch2: ImageMagick-5.3.6-nonroot.patch Patch3: ImageMagick-5.3.7-config.patch Patch4: ImageMagick-5.4.0-hp2xx.patch -Patch5: ImageMagick-5.4.2-localdoc.patch +Patch5: ImageMagick-5.4.7-localdoc.patch +Patch6: ImageMagick-5.4.7-stdin.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -105,12 +106,11 @@ however. %prep %setup -q -n %{name}-%{VER} %patch1 -p1 -b .lpr -%patch2 -p1 -b .nonroot +#%patch2 -p1 -b .nonroot %patch3 -p1 -b .config %patch4 -p1 -b .hp2xx %patch5 -p1 -b .ImageMagick -# Fix up a dependency -perl -pi -e "s,-L/home/cristy/ImageMagick/magick,-L../magick/.libs,g" PerlMagick/Makefile.PL +%patch6 -p1 -b .stdin %build libtoolize --force @@ -126,12 +126,13 @@ make rm -rf $RPM_BUILD_ROOT make PerlMagick/Makefile -perl -pi -e 's,^PREFIX.*,PREFIX = \$(DESTDIR)/usr,g;s,^config :: Makefile,config :: ,g;s,Makefile : ,Foo : ,g' PerlMagick/Makefile +perl -pi -e 's,^PREFIX.*,PREFIX = \$(DESTDIR)/usr,g;s,^config :: Makefile,config :: ,g;s,Makefile : ,Foo : ,g;s,^INSTALLSITEARCH = /usr,INSTALLSITEARCH = \$(DESTDIR)/usr,g' PerlMagick/Makefile perl -pi -e "s,-lMagick,-L../magick/.libs -lMagick,g" PerlMagick/Makefile cat >>PerlMagick/Makefile < 5.4.7-4 +- build using gcc-3.2-0.1 + +* Wed Jul 03 2002 Karsten Hopp 5.4.7-3 +- fix non-cpp headers in -devel package +- fix #62157 (wrong path for include files in ImageMagick-devel) +- fix #63897 (use _target instead of _arch) in libtool workaround +- fix #65860, #65780 (tiff2ps) expands images to >10 MB Postscript files. + +* Mon Jul 01 2002 Karsten Hopp 5.4.7-1 +- update +- fix localdoc patch +- fix %%files section +- disable nonroot patch +- fix #62100,55950,62162,63136 (display doesn't start form gnome menu) +- fix libtool workaround +- moved Magick*-config into -devel package (#64249) + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 6 2002 Bernhard Rosenkraenzer 5.4.6-1 +- 5.4.6 + * Thu Mar 14 2002 Bernhard Rosenkraenzer 5.4.3.11-1 - Update to pl 11 diff --git a/sources b/sources index ae839ef..e69216d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0908162ef995044e359beb15141467d3 ImageMagick-5.4.3-11.tar.bz2 +9230b39f89c9ea8f3331005d59b920b5 ImageMagick-5.4.7.tar.bz2