rpms
/
libdap
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- use pkg-config in dap-config

This commit is contained in:
pertusus 2008-01-02 08:51:37 +00:00
parent 12ca1ad300
commit f2febcca18
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libdap-3.7.8-nolibdir.patch
View File

@ -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)

5
libdap.spec
View File

@ -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 <pertusus@free.fr> 3.7.10-2
- use pkg-config in dap-config
* Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 3.7.10-1
- update to 3.7.10