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: 20-Apr-2005 13:41:17
Branch: HEAD Handle: 2005042012411700
Modified files:
openpkg-src/xrender xrender.spec
Log:
requires pkgconfig, remove (hopefully unnecessary) internal dependency
to renderext, and correct broken assumed dynamic library configuration
by hardcoding static library requirements into buildconf
Summary:
Revision Changes Path
1.16 +8 -3 openpkg-src/xrender/xrender.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xrender/xrender.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 xrender.spec
--- openpkg-src/xrender/xrender.spec 5 Apr 2005 18:40:46 -0000 1.15
+++ openpkg-src/xrender/xrender.spec 20 Apr 2005 11:41:17 -0000 1.16
@@ -37,7 +37,7 @@
Group: XWindow
License: GPL
Version: %{V_xrender}
-Release: 20050405
+Release: 20050420
# list of sources
Source0:
http://freedesktop.org/~ajax/xlibs-release/renderext-%{V_render}.tar.bz2
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11
-PreReq: OpenPKG, openpkg >= 20040130, X11
+BuildPreReq: OpenPKG, openpkg >= 20040130, X11, pkgconfig >= 0.14.0
+PreReq: OpenPKG, openpkg >= 20040130, X11, pkgconfig >= 0.14.0
AutoReq: no
AutoReqProv: no
@@ -69,6 +69,11 @@
%prep
%setup -q -c
%setup -q -T -D -a 1
+ %{l_shtool} subst \
+ -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
+ -e 's;echo \$RENDER_PKG_ERRORS;succeeded=yes;g' \
+ libXrender-%{V_xrender}/configure \
+ renderext-%{V_render}/configure
%build
( cd renderext-%{V_render}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
