rpms
/
ImageMagick
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolves BZ231259

This commit is contained in:
Norman Murray 2007-03-30 04:41:40 +00:00
parent d0e305193b
commit 479b37a13f
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ImageMagick-6.3.2-perl-liblink.patch Normal file
View File

@ -0,0 +1,22 @@
--- ImageMagick-6.3.2/PerlMagick/Makefile.PL.orig 2007-02-25 03:01:28.000000000 +1000
+++ ImageMagick-6.3.2/PerlMagick/Makefile.PL 2007-03-07 14:19:21.000000000 +1000
@@ -62,7 +62,7 @@ WriteMakefile
'INSTALLBIN' => '/usr/bin',
# Library specification
- 'LIBS' => [ '-L/usr/lib -lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ],
+ 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
--- ImageMagick-6.3.2/PerlMagick/Makefile.PL.in.orig 2006-09-20 00:53:54.000000000 +1000
+++ ImageMagick-6.3.2/PerlMagick/Makefile.PL.in 2007-03-07 14:20:11.000000000 +1000
@@ -62,7 +62,7 @@ WriteMakefile
'INSTALLBIN' => '@BIN_DIR@',
# Library specification
- 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],
+ 'LIBS' => [ '-L@MAGICKLIBDIR@ -L../magick/.libs -lMagick @LDFLAGS@ @MAGICK_DEP_LIBS@' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',

12
ImageMagick-6.3.2-perl-parallel-build.patch Normal file
View File

@ -0,0 +1,12 @@
--- ImageMagick-6.3.2/PerlMagick/Makefile.am.orig 2007-02-28 01:10:33.000000000 +0100
+++ ImageMagick-6.3.2/PerlMagick/Makefile.am 2007-02-28 01:12:12.000000000 +0100
@@ -41,7 +41,8 @@
if WITH_PERL_DYNAMIC
-$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+# add LIBMAGICK in deps to fix parallel make issue
+$(PERLMAKEFILE): perl-sources $(LIBMAGICK) $(PERLMAKEMAKER)
cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
install-exec-perl: $(PERLMAKEFILE)

11
ImageMagick.spec
View File

@ -9,7 +9,7 @@ Version: %{VER}.%{Patchlevel}
%else
Version: %{VER}
%endif
Release: 1%{?dist}
Release: 2%{?dist}
License: freeware
Group: Applications/Multimedia
%if "%{Patchlevel}" != ""
@ -20,7 +20,8 @@ Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
Source1: magick_small.png
Patch1: ImageMagick-6.2.1-local_doc.patch
Patch2: ImageMagick-6.2.8-multilib.patch
Patch3: ImageMagick-6.3.2-perl-parallel-build.patch
Patch4: ImageMagick-6.3.2-perl-liblink.patch
Url: http://www.imagemagick.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
@ -119,6 +120,9 @@ however.
%setup -q -n %{name}-%{VER}
%patch1 -p1 -b .local_doc
%patch2 -p1 -b .multilib
%patch3 -p1 -b .perl-build
%patch4 -p1 -b .perl-link
%build
%configure --enable-shared \
@ -254,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
* Fri Mar 30 2007 Norm Murray <nmurray@redhat.com> 6.3.2.9-2.fc7
- perlmagick build fix (#231259)
* Fri Mar 2 2007 Norm Murray <nmurray@redhat.com> 6.3.2.9-1.fc7.0
- update to 6.3.2-9