ooo-build r12572 - in branches/ooo-build-2-4: . distro-configs patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Fri May 16 19:50:01 2008
New Revision: 12572
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12572&view=rev

Log:
2008-05-16  Petr Mladek  <pmladek suse cz>

	* distro-configs/SUSE-11.0.conf.in, configure.in, patches/src680/apply:
	  branched for openSUSE-11.0 from the default SUSE.conf
	* distro-configs/SUSE.conf.in: use --with-java-target-version=1.5
	  instead of 1.4; it was forced in the spec file for openSUSE-11.0
	  anyway



Added:
   branches/ooo-build-2-4/distro-configs/SUSE-11.0.conf.in
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/configure.in
   branches/ooo-build-2-4/distro-configs/SUSE.conf.in
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/configure.in
==============================================================================
--- branches/ooo-build-2-4/configure.in	(original)
+++ branches/ooo-build-2-4/configure.in	Fri May 16 19:50:01 2008
@@ -1238,6 +1238,7 @@
 distro-configs/SUSE-10.1.conf
 distro-configs/SUSE-10.2.conf
 distro-configs/SUSE-10.3.conf
+distro-configs/SUSE-11.0.conf
 distro-configs/Mandriva.conf
 distro-configs/Mandriva64.conf
 distro-configs/NovellWin32.conf

Added: branches/ooo-build-2-4/distro-configs/SUSE-11.0.conf.in
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/distro-configs/SUSE-11.0.conf.in	Fri May 16 19:50:01 2008
@@ -0,0 +1,34 @@
+--with-vendor=\"Novell, Inc.\"
+--disable-access
+--disable-odk
+--disable-qadevooo
+--enable-libsn
+--enable-lockdown
+--enable-mono
+--enable-opengl
+--enable-ogltrans
+--with-ant-home=/usr/share/ant
+--without-stlport
+--with-java-target-version=1.5
+--with-jdk-home=$JAVA_HOME
+--with-system-boost
+--with-system-cairo
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-hunspell
+--with-system-icu
+--with-system-libwpd
+--with-system-libwpg
+--with-system-libwps
+--with-system-libxslt
+--with-system-mozilla=xulrunner
+--with-system-neon
+--with-system-odbc-headers
+--with-system-sablot
+--with-system-xalan
+--with-system-xerces
+--with-system-xml-apis
+--with-system-xrender-headers
+--with-xulrunner
+--without-myspell-dicts

Modified: branches/ooo-build-2-4/distro-configs/SUSE.conf.in
==============================================================================
--- branches/ooo-build-2-4/distro-configs/SUSE.conf.in	(original)
+++ branches/ooo-build-2-4/distro-configs/SUSE.conf.in	Fri May 16 19:50:01 2008
@@ -9,7 +9,7 @@
 --enable-ogltrans
 --with-ant-home=/usr/share/ant
 --without-stlport
---with-java-target-version=1.4
+--with-java-target-version=1.5
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Fri May 16 19:50:01 2008
@@ -51,6 +51,7 @@
 SUSE-10.1 : NovellBase, BerkeleyDB43
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
+SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, TransparentPrinting, PptExport, LinkWarningDlg
 SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, TransparentPrinting, PptExport, LinkWarningDlg
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian