ooo-build r13489 - trunk/scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13489 - trunk/scratch/split
Date: Wed, 6 Aug 2008 17:01:15 +0000 (UTC)
Author: michael
Date: Wed Aug  6 17:01:14 2008
New Revision: 13489
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13489&view=rev

Log:
more work ...


Added:
   trunk/scratch/split/rpmbuild   (contents, props changed)
   trunk/scratch/split/rpmenv
Modified:
   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/scratch/split/ooo3_artwork.spec
==============================================================================
--- trunk/scratch/split/ooo3_artwork.spec	(original)
+++ trunk/scratch/split/ooo3_artwork.spec	Wed Aug  6 17:01:14 2008
@@ -16,11 +16,11 @@
 BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/

Modified: trunk/scratch/split/ooo3_base.spec
==============================================================================
--- trunk/scratch/split/ooo3_base.spec	(original)
+++ trunk/scratch/split/ooo3_base.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
@@ -67,9 +69,8 @@
 
 %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 ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Wed Aug  6 17:01:14 2008
@@ -127,11 +127,11 @@
 %define	      ooo_home		ooo-3
 %define	      ooo_build_dir	build
 %define	      ooo_build_version 2.99.25
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}

Modified: trunk/scratch/split/ooo3_calc.spec
==============================================================================
--- trunk/scratch/split/ooo3_calc.spec	(original)
+++ trunk/scratch/split/ooo3_calc.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
@@ -67,9 +69,8 @@
 
 %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 ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- trunk/scratch/split/ooo3_components.spec	(original)
+++ trunk/scratch/split/ooo3_components.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_filters.spec
==============================================================================
--- trunk/scratch/split/ooo3_filters.spec	(original)
+++ trunk/scratch/split/ooo3_filters.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
@@ -67,9 +69,8 @@
 
 %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 ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_impress.spec
==============================================================================
--- trunk/scratch/split/ooo3_impress.spec	(original)
+++ trunk/scratch/split/ooo3_impress.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,7 +50,9 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
-$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
+OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
@@ -67,9 +69,8 @@
 
 %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 ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
 
 %files devel
 %defattr(-,root,root)

Modified: trunk/scratch/split/ooo3_l10n.spec
==============================================================================
--- trunk/scratch/split/ooo3_l10n.spec	(original)
+++ trunk/scratch/split/ooo3_l10n.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_gui-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Wed Aug  6 17:01:14 2008
@@ -18,11 +18,11 @@
 BuildRequires:  ooo3_bootstrap ooo3_ure
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -51,6 +51,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_bootstrap ooo3_libs_extern-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_bootstrap
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        7
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install

Modified: trunk/scratch/split/ooo3_writer.spec
==============================================================================
--- trunk/scratch/split/ooo3_writer.spec	(original)
+++ trunk/scratch/split/ooo3_writer.spec	Wed Aug  6 17:01:14 2008
@@ -17,11 +17,11 @@
 BuildRequires:  ooo3_libs_core-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
-%define	      ooo_build_tag     dev300-m25
+%define	      ooo_build_tag     dev300-m28
 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:        6
+Release:        8
 AutoReqProv:    on
 Summary:        A Free Office Suite (Framework)
 Url:            http://www.openoffice.org/
@@ -50,6 +50,8 @@
 export OO_INSTDIR=%{_libdir}/%ooo_home
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS=%{?jobs:-- -P%jobs}
 $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
@@ -67,9 +69,8 @@
 
 %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 ?
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
 
 %files devel
 %defattr(-,root,root)

Added: trunk/scratch/split/rpmbuild
==============================================================================
--- (empty file)
+++ trunk/scratch/split/rpmbuild	Wed Aug  6 17:01:14 2008
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+modules="bootstrap ure libs_extern artwork libs_gui libs_core components l10n impress writer calc base filters"
+if test "z$1" != "z"; then
+   buildfrom=$1
+   modules=`echo $modules | sed s/.*$buildfrom/$buildfrom/`;
+   echo "Buiding from $buildfrom: $modules"
+else
+   echo "Straight through build"
+   cd /opt/OpenOffice/HEAD
+   make dist || exit 1;
+fi
+verstr=3-8
+cd /usr/src/packages
+for module in $modules; do
+    sudo bash -l -c "/usr/bin/rpmbuild --eval '%define jobs 8' -ba SPECS/ooo3_$module.spec" || exit 1
+    echo "Installing $module RPM(s)"
+    sudo rpm -U --force RPMS/i586/ooo3_$module-$verstr.i586.rpm || exit 1
+    if test -f RPMS/i586/ooo3_$module-devel-$verstr.i586.rpm; then
+        sudo rpm -U --force RPMS/i586/ooo3_$module-devel-$verstr.i586.rpm || exit 1
+    fi
+done

Added: trunk/scratch/split/rpmenv
==============================================================================
--- (empty file)
+++ trunk/scratch/split/rpmenv	Wed Aug  6 17:01:14 2008
@@ -0,0 +1,4 @@
+export OO_INSTDIR=/usr/lib/ooo-3
+export OO_SOLVERDIR="$OO_INSTDIR/solver"
+export OO_TOOLSDIR="$OO_INSTDIR/ooo-build/bin"
+source $OO_TOOLSDIR/piece/sys-setup
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]