rpms/libdap/devel libdap-3.7.8-nolibdir.patch, 1.1, 1.2 libdap.spec, 1.20, 1.21

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libdap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6022

Modified Files:
	libdap-3.7.8-nolibdir.patch libdap.spec 
Log Message:
* Wed Jan  2 2008 Patrice Dumas <pertusus at free.fr> 3.7.10-2
- use pkg-config in dap-config


libdap-3.7.8-nolibdir.patch:

Index: libdap-3.7.8-nolibdir.patch
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap-3.7.8-nolibdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdap-3.7.8-nolibdir.patch	21 Oct 2007 10:41:07 -0000	1.1
+++ libdap-3.7.8-nolibdir.patch	2 Jan 2008 08:51:37 -0000	1.2
@@ -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 @@
  
      --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)


Index: libdap.spec
===================================================================
RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libdap.spec	1 Jan 2008 22:46:38 -0000	1.20
+++ libdap.spec	2 Jan 2008 08:51:37 -0000	1.21
@@ -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 @@
 
 
 %changelog
+* Wed Jan  2 2008 Patrice Dumas <pertusus at free.fr> 3.7.10-2
+- use pkg-config in dap-config
+
 * Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.7.10-1
 - update to 3.7.10