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: 25-Feb-2006 18:48:31
Branch: OPENPKG_2_5_SOLID Handle: 2006022517483000
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/imagemagick imagemagick.spec
Log:
MFC the latest two fixes: missing dependency, libxml required libiconv
Summary:
Revision Changes Path
1.278.2.3 +5 -4 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.278.2.2 -r1.278.2.3 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 16 Oct 2005 06:25:07 -0000
1.278.2.2
+++ openpkg-src/imagemagick/imagemagick.spec 25 Feb 2006 17:48:30 -0000
1.278.2.3
@@ -39,7 +39,7 @@
Group: Graphics
License: GPL
Version: %{V_opkg}
-Release: 2.5.0
+Release: 2.5.1
# package options
%option with_perl no
@@ -53,10 +53,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 2.5.0, make, gcc, grep, sed
PreReq: OpenPKG, openpkg >= 2.5.0
-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
+BuildPreReq: perl, perl-openpkg
PreReq: perl
%endif
%if "%{with_x11}" == "yes"
@@ -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 openpkg-cvs@openpkg.org
