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:41:22
Branch: HEAD Handle: 2007100920412100
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
cleanup Kerberos support
Summary:
Revision Changes Path
1.249 +5 -10 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.248 -r1.249 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 25 Sep 2007 20:18:11 -0000
1.248
+++ openpkg-src/postgresql/postgresql.spec 9 Oct 2007 19:41:21 -0000
1.249
@@ -48,7 +48,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20070925
+Release: 20071009
# package options
%option with_server yes
@@ -103,8 +103,8 @@
PreReq: tcl, tcl::with_x11 = yes, X11
%endif
%if "%{with_kerberos}" == "yes"
-BuildPreReq: kerberos
-PreReq: kerberos
+BuildPreReq: KERBEROS
+PreReq: KERBEROS
%endif
AutoReq: no
AutoReqProv: no
@@ -225,11 +225,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 \
@@ -263,8 +258,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
