ooo-build r13068 - in trunk: bin bin/piece scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13068 - in trunk: bin bin/piece scratch/split
Date: Fri, 4 Jul 2008 13:31:42 +0000 (UTC)
Author: michael
Date: Fri Jul  4 13:31:42 2008
New Revision: 13068
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13068&view=rev

Log:
fix src-pack2 snafu, more work ...


Modified:
   trunk/bin/piece/install-libs_extern
   trunk/bin/piece/install-libs_gui
   trunk/bin/piece/install-ure
   trunk/bin/src-pack2
   trunk/scratch/split/ooo3_bootstrap.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/install-libs_extern
==============================================================================
--- trunk/bin/piece/install-libs_extern	(original)
+++ trunk/bin/piece/install-libs_extern	Fri Jul  4 13:31:42 2008
@@ -1,4 +1,4 @@
 SRCDIR="$SOLARVER/$INPATH"
-DEST="$OO_SOLVERDIR/solver"
+DEST="$DESTDIR$OO_SOLVERDIR"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST

Modified: trunk/bin/piece/install-libs_gui
==============================================================================
--- trunk/bin/piece/install-libs_gui	(original)
+++ trunk/bin/piece/install-libs_gui	Fri Jul  4 13:31:42 2008
@@ -1,4 +1,4 @@
 SRCDIR="$SOLARVER/$INPATH"
-DEST="$OO_SOLVERDIR/solver"
+DEST="$DESTDIR$OO_SOLVERDIR"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST

Modified: trunk/bin/piece/install-ure
==============================================================================
--- trunk/bin/piece/install-ure	(original)
+++ trunk/bin/piece/install-ure	Fri Jul  4 13:31:42 2008
@@ -1,4 +1,4 @@
 SRCDIR="$SOLARVER/$INPATH"
-DEST="$OO_SOLVERDIR/solver"
+DEST="$DESTDIR$OO_SOLVERDIR"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Fri Jul  4 13:31:42 2008
@@ -90,14 +90,12 @@
     print "Verifying module map ...";
     
     for my $section (keys %{$module_map}) {
+#	print "check for $section\n";
 	for my $module (@{$module_map->{$section}}) {
+#	    print "\tcheck for $module\n";
 	    if (!defined $modules->{$module}) {
 		print "\n\nError: section '$section' contains non-existent module '$module'\n\n";
-		if ($force) {
-		    delete $module_map->{$section};
-		} else {
-		    $failed = 1;
-		}
+		$failed = 1 if (!$force);
 	    }
 	    delete $modules->{$module};
 	}
@@ -145,7 +143,7 @@
     symlink ($src, $newsrc ) if (! -l $newsrc);
 
     for my $b (@{$module_map{$a}}) {
-	$cmd .= "$newsrc/$b ";
+	$cmd .= "$newsrc/$b " if (-d "$newsrc/$b");
     }
     if (-f $dest_tar) {
 	print "\twarning: $dest_tar exists, skipping\n";

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Fri Jul  4 13:31:42 2008
@@ -131,7 +131,7 @@
 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:        4
+Release:        5
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Fri Jul  4 13:31:42 2008
@@ -19,11 +19,12 @@
 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:        4
+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
@@ -38,7 +39,7 @@
 devel package
 
 %prep
-%setup -q -n %ooo_build_tag
+%setup -q -n %ooo_build_tag-%piece
 
 %build
 
@@ -57,6 +58,7 @@
 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-%piece

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Fri Jul  4 13:31:42 2008
@@ -12,6 +12,7 @@
 
 %define         piece      libs_extern
 Name:           ooo3_%piece
+Requires:       ooo3_bootstrap
 BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
@@ -19,16 +20,18 @@
 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:        4
+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
@@ -38,7 +41,7 @@
 devel package
 
 %prep
-%setup -q -n %ooo_build_tag
+%setup -q -n %ooo_build_tag-%piece
 
 %build
 
@@ -57,6 +60,7 @@
 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-%piece

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Fri Jul  4 13:31:42 2008
@@ -12,6 +12,7 @@
 
 %define         piece      libs_gui
 Name:           ooo3_%piece
+Requires:       ooo3_ure ooo3_libs_extern
 BuildRequires:  ooo3_bootstrap-devel ooo3_libs_extern-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
@@ -19,16 +20,18 @@
 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:        4
+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
@@ -38,7 +41,7 @@
 devel package
 
 %prep
-%setup -q -n %ooo_build_tag
+%setup -q -n %ooo_build_tag-%piece
 
 %build
 
@@ -57,6 +60,7 @@
 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-%piece

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Fri Jul  4 13:31:42 2008
@@ -12,6 +12,7 @@
 
 %define         piece ure
 Name:           ooo3_%piece
+Requires:       ooo3_bootstrap
 BuildRequires:  ooo3_bootstrap-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
@@ -19,16 +20,18 @@
 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:        4
+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
@@ -38,7 +41,7 @@
 devel package
 
 %prep
-%setup -q -n %ooo_build_tag
+%setup -q -n %ooo_build_tag-%piece
 
 %build
 
@@ -57,6 +60,7 @@
 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-%piece
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]