From f2febcca18899cf175696f14b42d02a1b85cb43d Mon Sep 17 00:00:00 2001 From: pertusus Date: Wed, 2 Jan 2008 08:51:37 +0000 Subject: [PATCH] - use pkg-config in dap-config --- libdap-3.7.8-nolibdir.patch | 12 ++++++------ libdap.spec | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libdap-3.7.8-nolibdir.patch b/libdap-3.7.8-nolibdir.patch index 2a755fb..63f6499 100644 --- a/libdap-3.7.8-nolibdir.patch +++ b/libdap-3.7.8-nolibdir.patch @@ -1,6 +1,6 @@ -diff -up libdap-3.7.8/dap-config.in.nolibdir libdap-3.7.8/dap-config.in ---- libdap-3.7.8/dap-config.in.nolibdir 2007-10-21 10:55:52.000000000 +0200 -+++ libdap-3.7.8/dap-config.in 2007-10-21 10:57:03.000000000 +0200 +diff -up libdap-3.7.10/dap-config.in.nolibdir libdap-3.7.10/dap-config.in +--- libdap-3.7.10/dap-config.in.nolibdir 2007-05-12 23:32:21.000000000 +0200 ++++ libdap-3.7.10/dap-config.in 2008-01-02 09:48:20.000000000 +0100 @@ -4,7 +4,6 @@ # prefix=@prefix@ @@ -14,17 +14,17 @@ diff -up libdap-3.7.8/dap-config.in.nolibdir libdap-3.7.8/dap-config.in --libs) - echo "-L${libdir} -ldap -ldapserver -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" -+ echo "-ldap -ldapserver -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" ++ echo "`pkg-config --libs libdap libdapserver libdapclient`" ;; --server-libs) - echo "-L${libdir} -ldap -ldapserver @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" -+ echo "-ldap -ldapserver @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" ++ echo "`pkg-config --libs libdapserver`" ;; --client-libs) - echo "-L${libdir} -ldap -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" -+ echo "-ldap -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@" ++ echo "`pkg-config --libs libdapclient`" ;; --prefix) diff --git a/libdap.spec b/libdap.spec index 94eb6d3..875bf9d 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,7 +1,7 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP Version: 3.7.10 -Release: 1%{?dist} +Release: 2%{?dist} # the deflate program is covered by the W3C license License: LGPLv2+ and W3C @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 2 2008 Patrice Dumas 3.7.10-2 +- use pkg-config in dap-config + * Mon Dec 17 2007 Patrice Dumas 3.7.10-1 - update to 3.7.10