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: 09-Oct-2007 21:42:12
Branch: HEAD Handle: 2007100920421200
Modified files:
openpkg-src/postgresql83
postgresql83.spec
Log:
cleanup Kerberos support
Summary:
Revision Changes Path
1.2 +4 -9 openpkg-src/postgresql83/postgresql83.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql83/postgresql83.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 postgresql83.spec
--- openpkg-src/postgresql83/postgresql83.spec 9 Oct 2007 10:43:21
-0000 1.1
+++ openpkg-src/postgresql83/postgresql83.spec 9 Oct 2007 19:42:12
-0000 1.2
@@ -105,8 +105,8 @@
PreReq: tcl, tcl::with_x11 = yes, X11
%endif
%if "%{with_kerberos}" == "yes"
-BuildPreReq: kerberos
-PreReq: kerberos
+BuildPreReq: KERBEROS
+PreReq: KERBEROS
%endif
%if "%{with_xml}" == "yes"
BuildPreReq: libxml, libxslt, zlib
@@ -233,11 +233,6 @@
%if "%{with_jdbc}" == "yes"
%setup -q -T -D -a 8
%endif
-%if "%{with_kerberos}" == "yes"
- %{l_shtool} subst \
- -e 's;krb5 -ldes -lasn1 -lroken;krb5 -lk5crypto -lkrb5support
-lcom_err;g' \
- configure
-%endif
# adjust source tree
%{l_shtool} subst \
@@ -271,8 +266,8 @@
LDFLAGS="$LDFLAGS -L`%{l_rc} --query x11_libdir`"
%endif
%if "%{with_kerberos}" == "yes"
- CPPFLAGS="$CPPFLAGS %{l_cppflags kerberos}"
- LDFLAGS="$LDFLAGS %{l_ldflags kerberos}"
+ CPPFLAGS="$CPPFLAGS `krb5-config --cflags`"
+ LIBS="$LIBS `krb5-config --libs`"
%endif
%if "%{with_pgcluster}" == "yes"
case "%{l_platform -t}" in
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
