rpms/ImageMagick/devel .cvsignore, 1.23, 1.24 ImageMagick.spec, 1.82, 1.83 sources, 1.23, 1.24

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11485

Modified Files:
	.cvsignore ImageMagick.spec sources 
Log Message:
* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-5
- Remove 2 included copies of the non Free artbrush font (rh 477399)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	14 Nov 2008 14:54:41 -0000	1.23
+++ .cvsignore	27 Dec 2008 13:59:23 -0000	1.24
@@ -1 +1 @@
-ImageMagick-6.4.5-5.tar.bz2
+ImageMagick-6.4.5.5-clean.tar.bz2


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ImageMagick.spec	10 Dec 2008 11:13:56 -0000	1.82
+++ ImageMagick.spec	27 Dec 2008 13:59:23 -0000	1.83
@@ -3,12 +3,16 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        4%{?dist}
+Release:        5%{?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
+# This is: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2
+# With the 2 included copies of the non free ArtBrush font removed:
+# PerlMagick/t/ttf/input.ttf
+# PerlMagick/demo/Generic.ttf
+Source0:        %{name}-%{version}-clean.tar.bz2
 Patch1:         ImageMagick-6.4.0-multilib.patch
 Patch2:         ImageMagick-6.3.8-invalid-gerror-use.patch
 
@@ -303,6 +307,9 @@
 
 
 %changelog
+* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-5
+- Remove 2 included copies of the non Free artbrush font (rh 477399)
+
 * Wed Dec 10 2008 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-4
 - Do not pass -jX to make when building, this breaks PerlMagick (rh 475554)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	14 Nov 2008 14:54:41 -0000	1.23
+++ sources	27 Dec 2008 13:59:23 -0000	1.24
@@ -1 +1 @@
-c6a8c0b8ddc7c9310429d7e168dd6eba  ImageMagick-6.4.5-5.tar.bz2
+f1f95352f69d7c02ed19b0d3e0c806fb  ImageMagick-6.4.5.5-clean.tar.bz2