rpms/apr-util/devel apr-util-1.2.8-dbddso.patch, 1.5, 1.6 apr-util.spec, 1.44, 1.45

[Bojan Smojver (bojan)]

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14514

Modified Files:
	apr-util-1.2.8-dbddso.patch apr-util.spec 
Log Message:
Remove all instances of MySQL flags being added to APRUTIL_LDFLAGS

apr-util-1.2.8-dbddso.patch:

Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr-util-1.2.8-dbddso.patch	26 Nov 2007 22:50:36 -0000	1.5
+++ apr-util-1.2.8-dbddso.patch	2 Dec 2007 21:07:59 -0000	1.6
@@ -425,6 +425,14 @@
  ])
  dnl
  AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+@@ -101,7 +101,6 @@
+       else
+         if test "x$MYSQL_CONFIG" != 'x'; then
+           APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
+-          APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
+         fi
+       fi
+ 
 @@ -122,7 +121,6 @@
        AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
        if test "$apu_have_mysql" != "0"; then
@@ -433,6 +441,14 @@
        fi
  
        if test "$apu_have_mysql" != "1"; then
+@@ -135,7 +134,6 @@
+         AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
+         if test "$apu_have_mysql" != "0"; then
+           APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
+-          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+         fi
+       fi
+ 
 @@ -177,8 +174,9 @@
    dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
    dnl we know the library is there.


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- apr-util.spec	26 Nov 2007 22:50:36 -0000	1.44
+++ apr-util.spec	2 Dec 2007 21:07:59 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -145,6 +145,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Dec  3 2007 Jesse Keating <jkeating at redhat.com> - 1.2.12-2
+- remove all instances of MySQL flags being added to APRUTIL_LDFLAGS
+
 * Tue Nov 27 2007 Jesse Keating <jkeating at redhat.com> - 1.2.12-1
 - bump up to 1.2.12
 - drop MySQL DBD driver, shipped upstream