Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Mon May 3 21:35:38 CEST 2010. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-23 15:22:06.000000000 +0200 +++ OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2010-04-29 20:38:14.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 29 14:29:52 CEST 2010 - pmladek@suse.cz + +- added initial support to use the system libmysqlcppconn on openSUSE > 12.1; + the not-yet released version >= 1.0.6 was needed +- linked the internal libmysqlcppconn.so against a particular libmysqlclient.so; + then rpm was able to automatically detect the dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mysqlcppconn-static-mysql-binding.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.Smg4Ws/_old 2010-05-03 21:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Smg4Ws/_new 2010-05-03 21:34:22.000000000 +0200 @@ -22,7 +22,7 @@ # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no Version: 3.2.0.99.3 -Release: 1 +Release: 2 %define ooo_build_version 3.2.0.99.3 %define piece libs-extern #!BuildIgnore: OpenOffice_org @@ -31,7 +31,10 @@ BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: OpenOffice_org-ure-devel = %version # mysql stuff +%if %suse_version <= 1210 +# mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlclient-devel +%endif # mozilla stuff %if %suse_version > 1110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel @@ -75,6 +78,7 @@ %define __find_requires /bin/sh %_sourcedir/ooo-libs-extern-req %name Source100: ooo-libs-extern-prov Source101: ooo-libs-extern-req +Patch1000: mysqlcppconn-static-mysql-binding.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -147,6 +151,9 @@ %endif # mysql stuff cp %{S:90} mysqlcppconn/download +# +mkdir -p ooo-build/hotfixes +cp %{P:1000} ooo-build/hotfixes %build # setup env. ++++++ mysqlcppconn-static-mysql-binding.diff ++++++ --- mysqlcppconn/mysql-connector-cpp.patch.old 2010-03-29 20:51:14.000000000 +0200 +++ mysqlcppconn/mysql-connector-cpp.patch 2010-04-28 17:00:03.000000000 +0200 @@ -321,7 +321,7 @@ @@ -1 +1,2 @@ -dummy +#define HAVE_DLFCN_H 1 -+//#define MYSQLCLIENT_STATIC_BINDING 1 ++#define MYSQLCLIENT_STATIC_BINDING 1 --- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:53.694119382 +0200 +++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk 2009-08-17 21:32:50.534346360 +0200 @@ -1 +1,23 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org