OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Feb-2004 14:37:41
Branch: HEAD Handle: 2004021713374000
Modified files:
openpkg-src/apt apt.spec
Log:
switch to new world order
Summary:
Revision Changes Path
1.22 +7 -7 openpkg-src/apt/apt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 apt.spec
--- openpkg-src/apt/apt.spec 7 Feb 2004 17:53:29 -0000 1.21
+++ openpkg-src/apt/apt.spec 17 Feb 2004 13:37:40 -0000 1.22
@@ -38,7 +38,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20040207
+Release: 20040217
# list of sources
Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
@@ -54,8 +54,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, ncurses, readline, make, gcc, autoconf
-PreReq: OpenPKG, openpkg >= 20040130, ncurses, readline
+BuildPreReq: OpenPKG, openpkg >= 20040217, ncurses, readline, make, gcc, autoconf
+PreReq: OpenPKG, openpkg >= 20040217, ncurses, readline
AutoReq: no
AutoReqProv: no
@@ -80,7 +80,7 @@
%patch -p0
# replace hard-coded paths with OpenPKG ones
- l_rpmlibs_base="`%{l_prefix}/bin/rpm-config --libs`"
+ l_rpmlibs_base="`%{l_rpm_config} --libs`"
l_rpmlibs_extra=""
case "%{l_platform -t}" in
*sunos* ) l_rpmlibs_extra="${l_rpmlibs_extra} -lsocket" ;;
@@ -101,9 +101,9 @@
*sunos* ) defines="$defines -DOPENPKG_SOLARIS" ;;
esac
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/rpm-config --cppflags` $defines" \
- CFLAGS="%{l_cflags} `%{l_prefix}/bin/rpm-config --cflags`" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/rpm-config --ldflags`" \
+ CPPFLAGS="%{l_cppflags} `%{l_rpm_config} --cppflags` $defines" \
+ CFLAGS="%{l_cflags} `%{l_rpm_config} --cflags`" \
+ LDFLAGS="%{l_ldflags} `%{l_rpm_config} --ldflags`" \
./configure \
--prefix=%{l_prefix} \
--libdir=%{l_prefix}/lib \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
