ooo-build r14110 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Sep 26 13:26:20 2008
New Revision: 14110
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14110&view=rev

Log:
2008-09-26  Petr Mladek  <pmladek suse cz>

	* patches/dev300/apply: add PostgreSQL to NovellBase (fate#304558);
	  postgresql-devel is needed for build

	* patches/dev300/piece-reportbuilder.diff:
	* patches/dev300/piece-apache-commons.diff:
	* patches/dev300/apply: fix split build



Added:
   trunk/patches/dev300/piece-apache-commons.diff
   trunk/patches/dev300/piece-reportbuilder.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 26 13:26:20 2008
@@ -52,7 +52,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, Split, Shrink, \
-	     CustomUserConfig, CalcSolver
+	     CustomUserConfig, CalcSolver, PostgreSQL
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
@@ -2625,6 +2625,8 @@
 piece-extensions.diff
 piece-setup_native.diff
 piece-forms.diff
+piece-apache-commons.diff
+piece-reportbuilder.diff
 piece-reportdesign.diff
 piece-sc.diff
 piece-xmerge.diff

Added: trunk/patches/dev300/piece-apache-commons.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-apache-commons.diff	Fri Sep 26 13:26:20 2008
@@ -0,0 +1,11 @@
+--- apache-commons/java/logging/makefile.mk.old	2008-07-17 15:40:13.000000000 +0200
++++ apache-commons/java/logging/makefile.mk	2008-09-25 23:15:12.000000000 +0200
+@@ -57,7 +57,7 @@ CONVERTFILES=build.xml
+ OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+ 
+ .IF "$(SYSTEM_TOMCAT)" != "YES"
+-SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
++SERVLETAPI_JAR := $(SOLARPIECE)$/$(INPATH)$/bin$/servlet-api.jar
+ .ENDIF
+ 
+ .IF "$(JAVACISGCJ)"=="yes"

Added: trunk/patches/dev300/piece-reportbuilder.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-reportbuilder.diff	Fri Sep 26 13:26:20 2008
@@ -0,0 +1,28 @@
+--- reportbuilder/util/makefile.pmk.old	2008-08-12 16:14:14.000000000 +0200
++++ reportbuilder/util/makefile.pmk	2008-09-25 21:29:37.000000000 +0200
+@@ -29,10 +29,10 @@
+ #
+ #*************************************************************************
+ 
+-XSLDIR=$(SOLARXMLDIR)$/processing
+-XCSROOT=$(SOLARXMLDIR)
+-ABSXCSROOT=$(SOLARXMLDIR)
+-DTDDIR=$(SOLARXMLDIR)
++XCSROOT=$(SPLITINSTALLDIR)$/../share
++XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing
++ABSXCSROOT=$(XCSROOT)
++DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
+ PROCESSOUT=$(MISC)$/$(EXTNAME)
+ PROCESSORDIR=$(SOLARBINDIR)
+ 
+--- reportbuilder/util/makefile.mk.old	2008-08-12 16:14:14.000000000 +0200
++++ reportbuilder/util/makefile.mk	2008-09-25 21:38:02.000000000 +0200
+@@ -99,7 +99,7 @@ $(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_J
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ .ELSE
+-$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
++$(EXTENSIONDIR)$/%.jar : $(SOLARPIECE)$/$(INPATH)$/bin$/%.jar
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ .ENDIF