OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jun-2005 17:56:02
Branch: HEAD Handle: 2005063016560100
Modified files:
openpkg-src/rrdtool rrdtool.spec
Log:
because we provide a shared object for use with perl, its unresolved
freetype dependencies must match symbols in a freetype shared object
Summary:
Revision Changes Path
1.68 +6 -3 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 18 Jun 2005 10:40:14 -0000 1.67
+++ openpkg-src/rrdtool/rrdtool.spec 30 Jun 2005 15:56:01 -0000 1.68
@@ -33,7 +33,7 @@
Group: Database
License: LGPL
Version: 1.2.10
-Release: 20050618
+Release: 20050630
# package options
%option with_cgi no
@@ -46,8 +46,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig,
perl-openpkg >= 5.8.3-20040126
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: perl, png, zlib, libart, freetype
-PreReq: perl, png, zlib, libart, freetype
+BuildPreReq: perl, png, zlib, libart, freetype, freetype::with_shared = yes
+PreReq: perl, png, zlib, libart, freetype, freetype::with_shared = yes
%if "%{with_cgi}" == "yes"
BuildPreReq: cgilib, pkgconfig
PreReq: cgilib
@@ -75,6 +75,9 @@
%prep
%setup -q
rm -f perl-shared/ntmake.pl
+ %{l_shtool} subst \
+ -e 's;^\(my \$librrd =.*\$R \)-lrrd;\1 -R%{l_prefix}/lib/ftdyn -lrrd
-lfreetype;' \
+ bindings/perl-shared/Makefile.PL
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
