diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-11-20 14:54:38 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-20 14:59:30 +0100 |
| commit | 4f995b395ea347469ca9c7681d2f01f63e966d96 (patch) | |
| tree | e790b618e8fba1cd7f3016c050e3a69f563f1f44 | |
| parent | 5668e73beb30b95abc6520b7432c54972ca3ab2c (diff) | |
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
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 14fdbfd75e84..2c136c055e89 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 c84f4a994857..040963eea581 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 1db93452b3f1..b678bbf46ece 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); |