GNOME.org
 

ooo-build r13344 - in trunk: . patches/dev300 scratch/split

Author: michael
Date: Tue Jul 22 10:29:55 2008
New Revision: 13344
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13344&view=rev

Log:
2008-07-22  Michael Meeks  <michael meeks novell com>

        * patches/dev300/piece-target.diff: fix uno idl inc.
        * scratch/split/*: update.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_artwork.spec
   trunk/scratch/split/ooo3_base.spec
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_calc.spec
   trunk/scratch/split/ooo3_components.spec
   trunk/scratch/split/ooo3_filters.spec
   trunk/scratch/split/ooo3_impress.spec
   trunk/scratch/split/ooo3_l10n.spec
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec
   trunk/scratch/split/ooo3_ure.spec
   trunk/scratch/split/ooo3_writer.spec

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Tue Jul 22 10:29:55 2008
@@ -33,6 +33,14 @@
  .ENDIF			# "$(JARFILES)"!=""
  .IF "$(EXTRAJARFILES)"!=""
  NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)
+@@ -861,6 +861,6 @@
+ .IF "$(PRE)"!=""
+ UNOIDLINC!:=-I$(PRE)$/idl $(UNOIDLINC)
+ .ENDIF
+-UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
++UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc $(SOLARIDLINC) -I$(SOLARINCDIR)
+ 
+ CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
 
 --- solenv/inc/unxlngi6.mk
 +++ solenv/inc/unxlngi6.mk

Modified: trunk/scratch/split/ooo3_artwork.spec
==============================================================================
--- trunk/scratch/split/ooo3_artwork.spec	(original)
+++ trunk/scratch/split/ooo3_artwork.spec	Tue Jul 22 10:29:55 2008
@@ -13,14 +13,14 @@
 %define         distro     SUSE
 %define         piece      artwork
 Name:           ooo3_%piece
-BuildRequires:  ooo3_bootstrap-devel
+BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -31,7 +31,7 @@
 ure
 
 %package devel
-Requires:       ooo3_bootstrap-devel
+Requires:       ooo3_bootstrap
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Summary:        A Free Office Suite (Framework)
 Group:          Productivity/Office/Suite

Modified: trunk/scratch/split/ooo3_base.spec
==============================================================================
--- trunk/scratch/split/ooo3_base.spec	(original)
+++ trunk/scratch/split/ooo3_base.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Tue Jul 22 10:29:55 2008
@@ -77,7 +77,7 @@
 # build_module_in_parallel 0 = no
 #			   1 = yes (the number is defined be the number of cpus)
 #			   2,3,4... = yes (force the number of modules to be built in parallel)
-%define		build_module_in_parallel	1
+%define		build_module_in_parallel	0
 # prepare_build:	   0 = no
 #			   1 = yes (just build, install and create packages; without %%prep section and configure)
 %define		prepare_build 		1
@@ -126,12 +126,12 @@
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
 %define	      ooo_build_dir	build
-%define	      ooo_build_version 2.99.21
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_version 2.99.25
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}
@@ -291,16 +291,9 @@
 %post
 %preun
 %postun
-%post devel
 
 %files
 %defattr(-,root,root)
-# FIXME - should have the actual files in it ! ;-)
-# except we have ~none here - just a devel package (?)
-# is there anything we absolutely need here ?
-
-%files devel
-%defattr(-,root,root)
 %dir %ooo_prefix/%ooo_home/solver
 %dir %ooo_prefix/%ooo_home/solenv
 %dir %ooo_prefix/%ooo_home/ooo-build

Modified: trunk/scratch/split/ooo3_calc.spec
==============================================================================
--- trunk/scratch/split/ooo3_calc.spec	(original)
+++ trunk/scratch/split/ooo3_calc.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- trunk/scratch/split/ooo3_components.spec	(original)
+++ trunk/scratch/split/ooo3_components.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_filters.spec
==============================================================================
--- trunk/scratch/split/ooo3_filters.spec	(original)
+++ trunk/scratch/split/ooo3_filters.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_impress.spec
==============================================================================
--- trunk/scratch/split/ooo3_impress.spec	(original)
+++ trunk/scratch/split/ooo3_impress.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_l10n.spec
==============================================================================
--- trunk/scratch/split/ooo3_l10n.spec	(original)
+++ trunk/scratch/split/ooo3_l10n.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_gui-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Tue Jul 22 10:29:55 2008
@@ -14,14 +14,15 @@
 %define         piece      libs_extern
 Name:           ooo3_%piece
 Requires:       ooo3_bootstrap
-BuildRequires:  ooo3_bootstrap-devel
+# urg, ure dep is now required for cppunit ...
+BuildRequires:  ooo3_bootstrap ooo3_ure
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -32,7 +33,7 @@
 ure
 
 %package devel
-Requires:       ooo3_bootstrap-devel
+Requires:       ooo3_bootstrap
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Summary:        A Free Office Suite (Framework)
 Group:          Productivity/Office/Suite

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Tue Jul 22 10:29:55 2008
@@ -14,14 +14,14 @@
 %define         piece      libs_gui
 Name:           ooo3_%piece
 Requires:       ooo3_ure ooo3_libs_extern
-BuildRequires:  ooo3_bootstrap-devel ooo3_libs_extern-devel
+BuildRequires:  ooo3_bootstrap ooo3_libs_extern-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Tue Jul 22 10:29:55 2008
@@ -14,14 +14,14 @@
 %define         piece ure
 Name:           ooo3_%piece
 Requires:       ooo3_bootstrap
-BuildRequires:  ooo3_bootstrap-devel
+BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -32,7 +32,7 @@
 ure
 
 %package devel
-Requires:       ooo3_bootstrap-devel
+Requires:       ooo3_bootstrap
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Summary:        A Free Office Suite (Framework)
 Group:          Productivity/Office/Suite

Modified: trunk/scratch/split/ooo3_writer.spec
==============================================================================
--- trunk/scratch/split/ooo3_writer.spec	(original)
+++ trunk/scratch/split/ooo3_writer.spec	Tue Jul 22 10:29:55 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m21
+%define	      ooo_build_tag     dev300-m25
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]