OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2006 23:36:27
Branch: HEAD Handle: 2006021622362700
Modified files:
openpkg-src/imagemagick imagemagick.spec
Log:
fix building under with_perl=yes: libiconv dependency and linkage was
missing
Summary:
Revision Changes Path
1.286 +4 -3 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.285 -r1.286 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 31 Jan 2006 18:56:11 -0000
1.285
+++ openpkg-src/imagemagick/imagemagick.spec 16 Feb 2006 22:36:27 -0000
1.286
@@ -39,7 +39,7 @@
Group: Graphics
License: GPL
Version: %{V_opkg}
-Release: 20060131
+Release: 20060216
# package options
%option with_perl no
@@ -53,8 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, grep, sed
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml
-PreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml
+BuildPreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml,
libiconv
+PreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml,
libiconv
%if "%{with_perl}" == "yes"
BuildPreReq: perl
PreReq: perl
@@ -88,6 +88,7 @@
%setup -q -n ImageMagick-%{V_major}
%{l_shtool} subst \
-e 's/^\(MagickLibSubdir="\)[^"]*\("\)/\1imagemagick\2/' \
+ -e 's/\(-lxml2\)/\1 -liconv/' \
configure
%{l_shtool} subst \
-e 's;\([EMAIL PROTECTED]@\);-L../magick/.libs \1;g' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
