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

[Petr Mladek]

 patches/dev300/apply             |    3 ---
 patches/dev300/piece-mysqlc.diff |   19 -------------------
 2 files changed, 22 deletions(-)

New commits:
commit 3925320ecb2fc1fd8a4be86dafb3ced69cdc7e67
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 21 17:48:54 2010 +0200

    Bin obsolete piece-mysqlc.diff
    
    * patches/dev300/piece-mysqlc.diff: bin; the mysql-related 3rd libraries
      ended in the libs-extern piece and are in the system solver when
      building extensions
    * patches/dev300/apply: remove the above diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a1eb113..c87518b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3762,9 +3762,6 @@ piece-scripting.diff
 piece-helpcontent2.diff
 piece-sdext.diff
 piece-swext.diff
-[ PieceBits >= ooo320-m14 ]
-piece-mysqlc.diff
-[ PieceBits ]
 piece-writerfilter.diff
 piece-ridljar.diff
 piece-offapi.diff
diff --git a/patches/dev300/piece-mysqlc.diff b/patches/dev300/piece-mysqlc.diff
deleted file mode 100644
index d16151b..0000000
--- a/patches/dev300/piece-mysqlc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- mysqlc/source/makefile.mk.old	2010-04-15 18:37:58.000000000 +0200
-+++ mysqlc/source/makefile.mk	2010-04-15 18:56:14.000000000 +0200
-@@ -143,14 +143,14 @@ CDEFS += -DCPPCONN_LIB=\"$(shell readlin
-     .ELSE
-       MYSQL_LIB+=-rdynamic -lz -lcrypt -lnsl -lm
-     .ENDIF
--    MYSQL_CPPCONNFILE=$(SOLARLIBDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
-+    MYSQL_CPPCONNFILE=$(SOLARPIECE)$/$(INPATH)$/lib$/$(DLLPRE)mysqlcppconn$(DLLPOST)
-   .ELSE
-     MYSQL_CPPCONN_LIB+=-lmysqlcppconn
-   .ENDIF
- .ENDIF
- 
- .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
--  MYSQL_INC+=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn
-+  MYSQL_INC+=-I$(SOLARPIECE)$/$(INPATH)$/inc$/mysqlcppconn -I$(SOLARPIECE)$/$(INPATH)$/inc$/mysqlcppconn/cppconn
- .ENDIF
- 
- CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \