summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-18 13:39:29 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-18 13:46:49 +0200
commita9de59240243542033d798e7b55b849d9daaccc6 (patch)
tree1de5f937470a41c3c19143c8cf2f19bf3b18af48 /instsetoo_native
parentaa90fded06fae54cd6d1215e2fee9b93af5d04c2 (diff)
prefer filelist from GeneratedPackage over Package
This broke incremental builds on MacOS X in the past, where Package/python3.filelist was created for some reason, so the installer did not install the Python framework. (cherry picked from commit d72e170d6a956cf2cc7da1c0b5917bca3e79f5ce) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: instsetoo_native/util/openoffice.lst.in Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/openoffice.lst.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 2c8e8fdd59b5..589781ef97f8 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
}
}
@@ -138,7 +138,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
}
}
@@ -177,7 +177,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
}
}
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
}
}