[Libreoffice-commits] core.git: configure.ac scp2/source solenv/bin

[Andras Timar]

 configure.ac                             |    1 -
 scp2/source/ooo/scpaction_ooo.scp        |    2 +-
 solenv/bin/modules/installer/download.pm |    6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4f995b395ea347469ca9c7681d2f01f63e966d96
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Nov 20 14:54:38 2013 +0100

    fdo#67060 do not package RPM-only install script to DEB packs
    
    This reverts commit 5003ab57eee903d072fc7fac8cb5c69a34fb9d5c.
    It did not work, when both RPM and DEB were selected as targets.
    
    Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81

diff --git a/configure.ac b/configure.ac
index 14fdbfd..2c136c0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7347,7 +7347,6 @@ if test "$enable_epm" = "yes"; then
         elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
             RPM_PATH=`which $RPM`
             AC_MSG_RESULT([$RPM_PATH])
-            SCPDEFS="$SCPDEFS -DWITH_RPM"
         else
             AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
         fi
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index c84f4a9..040963e 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -44,7 +44,7 @@ ScpAction scp_Copy_Readme_Txt
 End
 #endif
 
-#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
+#if !defined(WNT) && !defined(MACOSX)
 ScpAction scp_Copy_Install
     Copy = "scripts/install";
     Name = "install";
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 1db9345..b678bbf 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -542,6 +542,12 @@ sub create_tar_gz_file_from_directory
     $installer::globals::downloadfilename = $downloadfilename . $installer::globals::downloadfileextension;
     my $targzname = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
 
+    # fdo#67060 - install script is for RPM only
+    if ( -e "$installdir/install" && !$installer::globals::isrpmbuild )
+    {
+        unlink("$installdir/install");
+    }
+
     my $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname";
 
     my $returnvalue = system($systemcall);