GNOME.org
 

ooo-build r13224 - in trunk: . bin bin/piece doc patches/dev300 scratch/split

Author: michael
Date: Tue Jul 15 15:22:49 2008
New Revision: 13224
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13224&view=rev

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

        * bin/unpack, bin/piece/unpack-extras: split out the
        extras unpack pieces.
        * bin/pieces/*, scratch/split/*: yet more work.



Added:
   trunk/bin/piece/install-artwork
   trunk/bin/piece/unpack-l10n   (contents, props changed)
   trunk/scratch/split/ooo3_artwork.spec
   trunk/scratch/split/ooo3_impress.spec
   trunk/scratch/split/ooo3_l10n.spec
Modified:
   trunk/ChangeLog
   trunk/bin/piece/Makefile.am
   trunk/bin/piece/build-generic
   trunk/bin/piece/install-bootstrap
   trunk/bin/piece/install-generic
   trunk/bin/piece/sys-setup
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_components.spec
   trunk/scratch/split/ooo3_filters.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

Modified: trunk/bin/piece/Makefile.am
==============================================================================
--- trunk/bin/piece/Makefile.am	(original)
+++ trunk/bin/piece/Makefile.am	Tue Jul 15 15:22:49 2008
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
 	sys-setup \
+	${wildcard env-*} \
 	${wildcard build-*} \
 	${wildcard install-*}

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Tue Jul 15 15:22:49 2008
@@ -1,8 +1,29 @@
-custom_env="$OO_TOOLSDIR/piece/env-$1"
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+distro=$3
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+custom_env="$OO_TOOLSDIR/piece/env-$piece"
 if test -f $custom_env; then
    source $custom_env
    echo "merged custom environment: $custom_env"
 fi
 
+custom_unpack="$OO_TOOLSDIR/piece/unpack-$piece"
+export GNUCP=cp
+if test -f $custom_unpack; then
+    echo "Invoke custom unpack: $custom_unpack"
+    $custom_unpack $OO_TOOLSDIR/.. `pwd`
+fi
+
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces \
+	--tag=$ooo_build_tag \
+	--distro=$distro --distro=Piece --distro=Binfilter \
+	--distro=System --distro=Sdk --distro=Localize --distro=swext \
+	 `pwd` 
+
 dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`
 perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Added: trunk/bin/piece/install-artwork
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-artwork	Tue Jul 15 15:22:49 2008
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+distro=$3
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+# copy all icons into local solver ...
+echo "Installing artwork ..."
+LOCALSOLVER="$SOLARPIECEVERSION/$INPATH"
+mkdir -p $LOCALSOLVER
+for dir in default_images external_images ooo_custom_images; do
+	cp -lR $SRC_ROOT/$dir $LOCALSOLVER
+done

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Tue Jul 15 15:22:49 2008
@@ -6,3 +6,16 @@
 mkdir -p $OOINSTDIR/ooo-build/patches
 cp -R $TOOLSDIR/bin/* $OOINSTDIR/ooo-build/bin
 cp -R $TOOLSDIR/patches/* $OOINSTDIR/ooo-build/patches
+
+# copy pieces of interest into src to be moved out later ...
+mkdir -p $OOINSTDIR/ooo-build/src
+cp -a \
+   $TOOLSDIR/src/*.dic \
+   $TOOLSDIR/src/*.bmp \
+   $TOOLSDIR/src/*.config.in \
+   $TOOLSDIR/src/*.pc.in \
+   $TOOLSDIR/src/*.png \
+   $TOOLSDIR/src/*.jpg \
+   $TOOLSDIR/src/*.patch \
+   $TOOLSDIR/src/*.odb \
+   $OOINSTDIR/ooo-build/src

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Tue Jul 15 15:22:49 2008
@@ -1,3 +1,16 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+distro=$3
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+custom_install="$OO_TOOLSDIR/piece/install-$piece"
+if test -f $custom_install; then
+    $custom_install $piece $ooo_build_tag $distro
+fi
+
 SRCDIR="$SOLARPIECEVERSION/$INPATH"
 DEST="$DESTDIR$OO_SOLVERDIR"
 mkdir -p $DEST

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Tue Jul 15 15:22:49 2008
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+if test "z$OO_INSTDIR" == "z"; then
+    echo "Error: missing oo instdir"
+    exit 1
+fi
+# a saneish default directory for the solver
+if test "z$OO_SOLVERDIR" == "z"; then
+    export OO_SOLVERDIR=$OO_INSTDIR/solver
+fi
+
 # installed system libraries
 URE_DIR=$OO_INSTDIR/ure
 INSTALL_DIR=$OO_INSTDIR/basis3.0/program

Added: trunk/bin/piece/unpack-l10n
==============================================================================
--- (empty file)
+++ trunk/bin/piece/unpack-l10n	Tue Jul 15 15:22:49 2008
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+TOOLSDIR=$1
+OOBUILDDIR=$2
+
+echo "Copying default evolution database into tree"
+$GNUCP -af $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
+echo "Copying custom user-dicts into tree"
+$GNUCP -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Jul 15 15:22:49 2008
@@ -51,7 +51,7 @@
 DEJAVU_FONTS_PACK_NAME= DEJAVU_FONTS_PACK_NAME@
 LIBERATION_FONTS_VER= LIBERATION_FONTS_VER@
 AGFA_MONOTYPE_FONTS_SOURCE= AGFA_MONOTYPE_FONTS_SOURCE@
-GNUCP= GNUCP@
+export GNUCP= GNUCP@
 GNUPATCH= GNUPATCH@
 GNUTAR= GNUTAR@
 DRINK="@DRINK@"

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Jul 15 15:22:49 2008
@@ -539,15 +539,11 @@
     $GNUCP -a $SRCDIR/$GRAPHITE_SRC $GRAPHITE_DEST || exit 1;
 fi
 
-echo "Copying default evolution database into tree"
-$GNUCP -af $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
+$TOOLSDIR/bin/piece/unpack-l10n $TOOLSDIR $OOBUILDDIR
 
 echo "Installing bibliography overwrides";
 $GNUTAR xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
 
-echo "Copying custom user-dicts into tree"
-$GNUCP -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
-
 if test "$CAIRO_ENABLED" = "TRUE" -a "$SYSTEM_CAIRO" != "TRUE"; then
     echo "Copying cairo into tree"
     mkdir -p $OOBUILDDIR/cairo

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Tue Jul 15 15:22:49 2008
@@ -244,9 +244,10 @@
 	+ ure | libs_extern
 	+ libs_gui
 	+ libs_core
-	+ components | ? filters
+	+ components | artwork
+	+ l10n
+	+ impress | filters
 
-	+ artwork
 
 
 build.pl:

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 15:22:49 2008
@@ -2533,6 +2533,7 @@
 # zipintro is not kind to us ...
 piece-desktop.diff
 piece-scripting.diff
+piece-helpcontent2.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Tue Jul 15 15:22:49 2008
@@ -14,6 +14,15 @@
  .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
  SOLARINC+=$(JDKINCS)
  # make sure INCLUDE isn't set
+@@ -218,6 +218,7 @@
+ LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
+ NEWCLASS:=$(LOCALJARS)
+ NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)$/$(INPATH)$/bin/$i $(NULL)))
+ .ENDIF			# "$(JARFILES)"!=""
+ .IF "$(EXTRAJARFILES)"!=""
+ NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)
+
 --- solenv/inc/unxlngi6.mk
 +++ solenv/inc/unxlngi6.mk
 @@ -182,7 +182,7 @@
@@ -25,11 +34,3 @@
  STDOBJGUI=
  STDSLOGUI=
  STDOBJCUI=
-@@ -218,6 +218,7 @@
- LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
- NEWCLASS:=$(LOCALJARS)
- NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)$/$(INPATH)$/bin/$i $(NULL)))
- .ENDIF			# "$(JARFILES)"!=""
- .IF "$(EXTRAJARFILES)"!=""
- NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)

Added: trunk/scratch/split/ooo3_artwork.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_artwork.spec	Tue Jul 15 15:22:49 2008
@@ -0,0 +1,78 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      artwork
+Name:           ooo3_%piece
+BuildRequires:  ooo3_bootstrap-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+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
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_bootstrap-devel
+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
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+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
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%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
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Tue Jul 15 15:22:49 2008
@@ -10,7 +10,7 @@
 
 # norootforbuild
 
-
+%define         distro     SUSE
 %define         piece bootstrap
 Name:           ooo3_bootstrap
 BuildRequires:  ImageMagick ant bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip

Modified: trunk/scratch/split/ooo3_components.spec
==============================================================================
--- trunk/scratch/split/ooo3_components.spec	(original)
+++ trunk/scratch/split/ooo3_components.spec	Tue Jul 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece      components
 Name:           ooo3_%piece
 Requires:       ooo3_libs_core
@@ -45,28 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-
 export VERBOSE=1
-# export EXTRA_BUILD_FLAGS="-P2"
-$OO_TOOLSDIR/piece/build-generic %piece
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_filters.spec
==============================================================================
--- trunk/scratch/split/ooo3_filters.spec	(original)
+++ trunk/scratch/split/ooo3_filters.spec	Tue Jul 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece      filters
 Name:           ooo3_%piece
 Requires:       ooo3_libs_core
@@ -45,28 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-
 export VERBOSE=1
-# export EXTRA_BUILD_FLAGS="-P2"
-$OO_TOOLSDIR/piece/build-generic %piece
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post

Added: trunk/scratch/split/ooo3_impress.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_impress.spec	Tue Jul 15 15:22:49 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      impress
+Name:           ooo3_%piece
+Requires:       ooo3_libs_core
+BuildRequires:  ooo3_libs_core-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+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
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
+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
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+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
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%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
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

Added: trunk/scratch/split/ooo3_l10n.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_l10n.spec	Tue Jul 15 15:22:49 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      l10n
+Name:           ooo3_%piece
+Requires:       ooo3_libs_core
+BuildRequires:  ooo3_libs_core-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m21
+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
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
+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
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+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
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+%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
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

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 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece      libs_core
 Name:           ooo3_%piece
 Requires:       ooo3_libs_gui
@@ -45,28 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-
 export VERBOSE=1
-# export EXTRA_BUILD_FLAGS="-P2"
-$OO_TOOLSDIR/piece/build-generic %piece
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post

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 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece      libs_extern
 Name:           ooo3_%piece
 Requires:       ooo3_bootstrap
@@ -45,25 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/build-generic %piece
+export VERBOSE=1
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post

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 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece      libs_gui
 Name:           ooo3_%piece
 Requires:       ooo3_ure ooo3_libs_extern
@@ -45,28 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-
 export VERBOSE=1
-# export EXTRA_BUILD_FLAGS="-P2"
-$OO_TOOLSDIR/piece/build-generic %piece
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Tue Jul 15 15:22:49 2008
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+%define         distro     SUSE
 %define         piece ure
 Name:           ooo3_%piece
 Requires:       ooo3_bootstrap
@@ -45,25 +46,20 @@
 
 %build
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
-
-$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/build-generic %piece
+export VERBOSE=1
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
 
 %install
 
-#setup env.
+# setup env.
 export OO_INSTDIR=%{_libdir}/%ooo_home
-export OO_SOLVERDIR=$OO_INSTDIR/solver
 export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 export DESTDIR=$RPM_BUILD_ROOT
 
-source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic %piece
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
 
 %clean
 %post
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]