From 732fadd14bc2105c27e01a12ebbe9e9c8a09a7aa Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 27 Dec 2008 13:59:23 +0000 Subject: [PATCH] - Remove 2 included copies of the non Free artbrush font (rh 477399) --- .cvsignore | 2 +- ImageMagick.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2e631e1..969b796 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-6.4.5-5.tar.bz2 +ImageMagick-6.4.5.5-clean.tar.bz2 diff --git a/ImageMagick.spec b/ImageMagick.spec index c9d6b52..3453bb7 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 27 2008 Hans de Goede 6.4.5.5-5 +- Remove 2 included copies of the non Free artbrush font (rh 477399) + * Wed Dec 10 2008 Hans de Goede 6.4.5.5-4 - Do not pass -jX to make when building, this breaks PerlMagick (rh 475554) diff --git a/sources b/sources index af883b4..558c15e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6a8c0b8ddc7c9310429d7e168dd6eba ImageMagick-6.4.5-5.tar.bz2 +f1f95352f69d7c02ed19b0d3e0c806fb ImageMagick-6.4.5.5-clean.tar.bz2