[ooo-build-commit] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                  |    5 +++++
 patches/dev300/ct2n-build.diff                        |    4 ++--
 patches/dev300/mysqlcppconn-static-mysql-binding.diff |   11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit ac3711ff188da5bf960e881a182f3c06e0982e41
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 6 18:30:59 2010 +0200

    link against the versioned libmysqlcppconn (NovellLinuxOnly)
    
    * patches/dev300/mysqlcppconn-static-mysql-binding.diff: set
      MYSQLCLIENT_STATIC_BINDING; we do not want to require the devel package;
      FIXME: this should be set automatically when you use the system mysqlcppconn
    * patches/dev300/apply: add the above in NovellLinuxOnly section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bdb796c..f5ade6c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1158,6 +1158,11 @@ help-support.diff, michael
 # change user config dir name from ~/.openoffice.org3 to ~/.ooo3
 scp2-user-config-ooo3.diff, pmladek
 
+# link against the versioned libmysqlcppconn
+# we do not want to require the devel package
+# FIXME: this should be set automatically when you use the system mysqlcppconn
+mysqlcppconn-static-mysql-binding.diff, pmladek
+
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
diff --git a/patches/dev300/mysqlcppconn-static-mysql-binding.diff b/patches/dev300/mysqlcppconn-static-mysql-binding.diff
new file mode 100644
index 0000000..aedb743
--- /dev/null
+++ b/patches/dev300/mysqlcppconn-static-mysql-binding.diff
@@ -0,0 +1,11 @@
+--- 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 @@
commit 8d1a2052b91a52c057d4b96d8609de8e31e462be
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 6 18:22:03 2010 +0200

    More strict build dependency for the ct2n extension (bnc#595550)
    
    * patches/dev300/ct2n-build.diff: depend on PREDELIVER_FLAG_FILE

diff --git a/patches/dev300/ct2n-build.diff b/patches/dev300/ct2n-build.diff
index 1dd0176..7222edb 100644
--- a/patches/dev300/ct2n-build.diff
+++ b/patches/dev300/ct2n-build.diff
@@ -190,7 +190,7 @@ diff -purN ct2n.old/makefile.mk ct2n/makefile.mk
 +ZIP1FLAGS=-u -r
 +ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR)
 +ZIP1LIST= * -x "*.orig" -x "so_*_ct2n"
-+ZIP1DEPS=$(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
++ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
 +
 +# --- Targets ------------------------------------------------------
 +
@@ -198,7 +198,7 @@ diff -purN ct2n.old/makefile.mk ct2n/makefile.mk
 +.INCLUDE : tg_ext.mk
 +.INCLUDE : target.mk
 +
-+ZIP1TARGET : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
++ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
 diff -purN ct2n.old/delzip ct2n/delzip
 --- ct2n.old/delzip	2007-04-20 17:59:41.000000000 +0200
 +++ ct2n/delzip	2010-03-09 10:55:28.000000000 +0100