From 616270f73fae57adb58863336cc3d37aabbebf43 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 02:38:35 +0000 Subject: [PATCH] auto-import changelog data from ImageMagick-6.0.6.2-1.src.rpm Wed Sep 01 2004 Karsten Hopp 6.0.6.2-1 - update to latest stable version - get rid of obsolete patches - fix remaining patches Sat Jun 19 2004 Alan Cox - Easyfixes (#124791) - fixed missing dependancy between -devel and libexif-devel Tue Jun 15 2004 Elliot Lee - rebuilt --- .cvsignore | 2 +- ImageMagick-5.4.7-localdoc.patch | 24 +------------------- ImageMagick-6.0.6-hp2xx.patch | 21 +++++++++++++++++ ImageMagick.spec | 39 ++++++++++++++++++++------------ sources | 2 +- 5 files changed, 49 insertions(+), 39 deletions(-) create mode 100644 ImageMagick-6.0.6-hp2xx.patch diff --git a/.cvsignore b/.cvsignore index 9c79a36..1530f98 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-5.5.7-15.tar.bz2 +ImageMagick-6.0.6-2.tar.gz diff --git a/ImageMagick-5.4.7-localdoc.patch b/ImageMagick-5.4.7-localdoc.patch index dae0396..d95378e 100644 --- a/ImageMagick-5.4.7-localdoc.patch +++ b/ImageMagick-5.4.7-localdoc.patch @@ -1,32 +1,10 @@ ---- 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/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/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='mozilla' +BrowseDelegateDefault='htmlview' CGMDecodeDelegateDefault='ralcgm' CatDelegateDefault='cat' diff --git a/ImageMagick-6.0.6-hp2xx.patch b/ImageMagick-6.0.6-hp2xx.patch new file mode 100644 index 0000000..1d62c10 --- /dev/null +++ b/ImageMagick-6.0.6-hp2xx.patch @@ -0,0 +1,21 @@ +--- ImageMagick-6.0.6/config/delegates.mgk.in.hp2xx 2004-09-01 23:23:12.924364520 +0200 ++++ ImageMagick-6.0.6/config/delegates.mgk.in 2004-09-01 23:28:45.415818136 +0200 +@@ -70,8 +70,16 @@ + + +- ++ + + + diff --git a/ImageMagick.spec b/ImageMagick.spec index f09b49a..0e8bf13 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.5.7 -%define Patchlevel 15 +%define VER 6.0.6 +%define Patchlevel 2 Summary: An X application for displaying and manipulating images. Name: ImageMagick %if "%{Patchlevel}" != "" @@ -9,23 +9,21 @@ Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 1.3 +Release: 1 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.gz %else -Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 +Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.gz %endif Source1: magick_small.png -Patch1: ImageMagick-5.5.6-lprhack.patch Patch2: ImageMagick-5.3.6-nonroot.patch Patch3: ImageMagick-5.3.7-config.patch -Patch4: ImageMagick-5.5.6-hp2xx.patch +Patch4: ImageMagick-6.0.6-hp2xx.patch Patch5: ImageMagick-5.4.7-localdoc.patch Patch6: ImageMagick-5.5.7-stdin.patch Patch7: ImageMagick-5.5.7-automake.patch -Patch8: ImageMagick-5.5.7-freetype.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -54,6 +52,7 @@ Summary: Static libraries and header files for ImageMagick app development. Group: Development/Libraries Requires: ImageMagick = %{version}-%{release}, bzip2-devel, freetype-devel Requires: libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel, libxml2-devel +Requires: libexif-devel %description devel Image-Magick-devel contains the static libraries and header files you'll @@ -108,14 +107,12 @@ however. %prep %setup -q -n %{name}-%{VER} -%patch1 -p1 -b .lpr #%patch2 -p1 -b .nonroot #%patch3 -p1 -b .config %patch4 -p1 -b .hp2xx %patch5 -p1 -b .ImageMagick -%patch6 -p1 -b .stdin +# KH: %patch6 -p1 -b .stdin #%patch7 -p1 -b .amake -%patch8 -p1 -b .ftype %build libtoolize --copy --force @@ -150,7 +147,7 @@ make install DESTDIR=$RPM_BUILD_ROOT PERL_MAKE_OPTIONS="%perl_make_options" #cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons # Add files make install constantly forgets -install -c -m 644 coders/*.mgk $RPM_BUILD_ROOT/usr/share/ImageMagick +install -c -m 644 config/*.mgk $RPM_BUILD_ROOT/usr/share/ImageMagick #cat >$RPM_BUILD_ROOT/etc/X11/applnk/Graphics/ImageMagick.desktop < 6.0.6.2-1 +- update to latest stable version +- get rid of obsolete patches +- fix remaining patches + +* Sat Jun 19 2004 Alan Cox +- Easyfixes (#124791) - fixed missing dependancy between -devel and + libexif-devel + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Tue Mar 23 2004 Karsten Hopp 5.5.7.15-1.3 - freetype patch to fix convert (#115716) diff --git a/sources b/sources index 3a66237..d274df2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6780f81dee32f1e8d2f277b6fe621955 ImageMagick-5.5.7-15.tar.bz2 +477a361ba0154cc2423726fab4a3f57c ImageMagick-6.0.6-2.tar.gz