rpms/ImageMagick/devel .cvsignore, 1.15, 1.16 ImageMagick-6.2.1-local_doc.patch, 1.1, 1.2 ImageMagick.spec, 1.43, 1.44 sources, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28875

Modified Files:
	.cvsignore ImageMagick-6.2.1-local_doc.patch ImageMagick.spec 
	sources 
Log Message:
Update to 6.2.4-6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	26 Apr 2005 14:03:17 -0000	1.15
+++ .cvsignore	20 Sep 2005 17:14:20 -0000	1.16
@@ -2,3 +2,4 @@
 ImageMagick-6.2.0-7.tar.gz
 ImageMagick-6.2.1-7.tar.bz2
 ImageMagick-6.2.2-0.tar.bz2
+ImageMagick-6.2.4-6.tar.bz2

ImageMagick-6.2.1-local_doc.patch:
 version.h.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ImageMagick-6.2.1-local_doc.patch
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick-6.2.1-local_doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImageMagick-6.2.1-local_doc.patch	25 Apr 2005 14:57:56 -0000	1.1
+++ ImageMagick-6.2.1-local_doc.patch	20 Sep 2005 17:14:20 -0000	1.2
@@ -1,25 +1,3 @@
---- ImageMagick-6.1.8/configure.ac.local_doc	2005-01-18 10:36:52.264401000 -0600
-+++ ImageMagick-6.1.8/configure.ac	2005-01-18 10:43:20.923316728 -0600
-@@ -1986,7 +1986,7 @@
- # Default delegate definitions
- AutotraceDecodeDelegateDefault='autotrace'
- BZIPDelegateDefault='bzip2'
--BrowseDelegateDefault='mozilla'
-+BrowseDelegateDefault='htmlview'
- CGMDecodeDelegateDefault='ralcgm'
- CatDelegateDefault='cat'
- CRWDecodeDelegateDefault='dcraw'
---- ImageMagick-6.1.8/configure.local_doc	2005-01-13 20:48:03.000000000 -0600
-+++ ImageMagick-6.1.8/configure	2005-01-18 10:43:34.126309568 -0600
-@@ -44627,7 +44627,7 @@
- # Default delegate definitions
- AutotraceDecodeDelegateDefault='autotrace'
- BZIPDelegateDefault='bzip2'
--BrowseDelegateDefault='mozilla'
-+BrowseDelegateDefault='htmlview'
- CGMDecodeDelegateDefault='ralcgm'
- CatDelegateDefault='cat'
- CRWDecodeDelegateDefault='dcraw'
 --- ImageMagick-6.1.8/magick/version.h.in.local_doc	2004-12-17 18:28:02.000000000 -0600
 +++ ImageMagick-6.1.8/magick/version.h.in	2005-01-18 10:42:27.712406016 -0600
 @@ -28,7 +28,7 @@


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ImageMagick.spec	9 Jun 2005 12:01:19 -0000	1.43
+++ ImageMagick.spec	20 Sep 2005 17:14:20 -0000	1.44
@@ -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 6.2.2
-%define Patchlevel 0
+%define VER 6.2.4
+%define Patchlevel 6
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
 %if "%{Patchlevel}" != ""
@@ -18,13 +18,7 @@
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
 %endif
 Source1: magick_small.png
-Patch2: ImageMagick-6.2.1-hp2xx.patch
-Patch3: ImageMagick-6.2.0-compress.patch
 Patch4: ImageMagick-6.2.1-local_doc.patch
-Patch6: ImageMagick-6.2.1-pkgconfig.patch
-Patch7: ImageMagick-6.2.1-fixed.patch
-# 158791
-Patch8: ImageMagick-5.5.6-mask.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -57,6 +51,10 @@
 Requires: %{name} = %{version}-%{release}
 Requires: XFree86-devel
 Requires: ghostscript-devel
+Requires: bzip2-devel
+Requires: libtiff-devel
+Requires: libjpeg-devel
+Requires: pkgconfig
 
 %description devel
 ImageMagick-devel contains the static libraries and header files you'll
@@ -113,12 +111,7 @@
 
 %prep
 %setup -q -n %{name}-%{VER}
-%patch2 -p1 -b .hp2xx
-%patch3 -p1 -b .compress
 %patch4 -p1 -b .local_doc
-%patch6 -p1 -b .pkgconfig
-%patch7 -p1 -b .fixed
-%patch8 -p1 -b .mask
 
 %build
 %configure --enable-shared \
@@ -130,7 +123,8 @@
 	   --with-gslib \
            --with-wmf \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LD='%__ld -L$PWD/magick/.libs'" \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType
+           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
+	   --without-dps
 
 make
 
@@ -228,6 +222,12 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Tue Sep 20 2005 Matthias Clasen <mclasen at redhat.com> 6.2.4.6-1
+- Update to 6.2.4-6
+- Drop upstreamed patches
+- Disable DPS (#158984)
+- Add missing requires (#165931)
+
 * Thu Jun  9 2005 Tim Waugh <twaugh at redhat.com> 6.2.2.0-4
 - Rebuilt for fixed ghostscript.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Apr 2005 14:03:17 -0000	1.15
+++ sources	20 Sep 2005 17:14:20 -0000	1.16
@@ -1 +1 @@
-6afb63630b870525f16ae4b084eb9e7a  ImageMagick-6.2.2-0.tar.bz2
+82cb623a5e2e01991d22d33c624ad12d  ImageMagick-6.2.4-6.tar.bz2