summaryrefslogtreecommitdiff
path: root/setup_native/source/packinfo/packinfo_test.txt
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-06-18 17:13:44 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-24 12:54:47 +0000
commitd07cbe86f34ca6dfc6580b63879235c339831a5e (patch)
tree6f0ee61ed8933272d3c47680cbba9363746b7255 /setup_native/source/packinfo/packinfo_test.txt
parent5ac84ff884b491df4631d78b3c4ba74eddb0b1a5 (diff)
fdo#65541: Proper EPM %requires dependencies, at least for Linux
At least for Linux RPM, the packages built via EPM in module instset_native (with --enable-epm) record intra-installation-set dependencies only by name but without any version numbers, so that one can e.g. freely ask rpm to install a (broken) combination of packages from LibreOffice_4.0.2_Linux_x86-64_rpm.tar.gz and LibreOffice_4.0.3_Linux_x86-64_rpm.tar.gz. The documentation for EPM (e.g., workdir/*/UnpackedTarball/epm/doc/epm- manual.pdf) states that %requires lines can optionally indicate lower and upper version numbers, so the easiest fix appears to be to augment all relevant "requires =" lines in setup_native/source/packinfo/packinfo_*.txt with lower == upper == %PACKAGEVERSION. (There appears to be some confusion in those files between %PACKAGEVERSION and %ABOUTBOXPRODUCTVERSION, but those seem to always get identical values in instsetoo_native/util/openoffice.lst.in.) Change-Id: Iea68beb19f1699cc1eea3dc36fd2f11b8845e390 TODO: The freebsdrequires and solarisrequires lines are not updated. Reviewed-on: https://gerrit.libreoffice.org/4344 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'setup_native/source/packinfo/packinfo_test.txt')
-rw-r--r--setup_native/source/packinfo/packinfo_test.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup_native/source/packinfo/packinfo_test.txt b/setup_native/source/packinfo/packinfo_test.txt
index e98e86f1097e..67dc0fa0927b 100644
--- a/setup_native/source/packinfo/packinfo_test.txt
+++ b/setup_native/source/packinfo/packinfo_test.txt
@@ -23,7 +23,7 @@ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-smoketest"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-smoketest"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation"