[ooo-build-commit] .: bin/ooo-pack-sources

[Petr Mladek]

 bin/ooo-pack-sources |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit c8cb118298e06b283576ef38d19113a499370338
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Sep 17 21:23:59 2010 +0200

    run autoreconf when packing bootstrap sources by ooo-pack-sources
    
    pregenerated configure is usually part of source tarballs

diff --git a/bin/ooo-pack-sources b/bin/ooo-pack-sources
index 7f48502..dacd652 100755
--- a/bin/ooo-pack-sources
+++ b/bin/ooo-pack-sources
@@ -195,6 +195,15 @@ sub copy_ooo_piece_to_tempdir($$$)
     return $tempdir;
 }
 
+sub run_autoreconf($$)
+{
+    my ($dir, $piece) = @_;
+
+    print "Running autoreconf for $piece...\n";
+    system ("cd $dir && " .
+            "autoreconf -f -i && " .
+            "cd - >/dev/null 2>&1") && die "Error: autoreconf failed: $!\n";
+}
 
 sub release_ooo_build($)
 {
@@ -377,7 +386,11 @@ sub prepare_ooo_piece_tarball($$$$$)
 {
     my ($piece_dir, $release_version, $md5, $piece, $piece_tarball) = @_;
 
+    my $top_dir = $piece_tarball;
+    $top_dir =~ s/.tar.bz2$//;
+
     my $temp_dir = copy_ooo_piece_to_tempdir($piece_dir, $piece, $piece_tarball);
+    run_autoreconf("$temp_dir/$top_dir", $piece) if ($piece eq 'bootstrap');
     release_ooo_piece($temp_dir, $piece_tarball);
     generate_md5($temp_dir, $piece_tarball) if (defined $md5);