Skip to content

C
core
Kaydet (Commit) d07cbe86 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) David Tardon
Dosyalara gözat
Seçenekler

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/4344Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 5ac84ff8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
setup_native/source/packinfo/packinfo_accessories.txt
Dosyayı görüntüle @ d07cbe86
......@@ -42,7 +42,7 @@ module = "gid_Module_Optional_Accessories_Gallery"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-gallery"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-gallery"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
copyright = "1999-2008 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
......@@ -59,7 +59,7 @@ module = "gid_Module_Optional_Accessories_Fonts"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-fonts"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-fonts"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
copyright = "1999-2008 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
......@@ -76,7 +76,7 @@ module = "gid_Module_Optional_Accessories_Tem_Common"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extra-templates-common"
solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extra-templates-common"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
copyright = "1999-2008 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
......
setup_native/source/packinfo/packinfo_brand.txt
Dosyayı görüntüle @ d07cbe86
......@@ -20,7 +20,7 @@ Start
module = "gid_Module_Root_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%BASISPACKAGEPREFIX%PRODUCTVERSION-images"
requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07 %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-images %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -34,7 +34,7 @@ Start
module = "gid_Module_Brand_Prg_Wrt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -48,7 +48,7 @@ Start
module = "gid_Module_Brand_Prg_Calc"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -62,7 +62,7 @@ Start
module = "gid_Module_Brand_Prg_Impress"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -76,7 +76,7 @@ Start
module = "gid_Module_Brand_Prg_Draw"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -90,7 +90,7 @@ Start
module = "gid_Module_Brand_Prg_Math"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -104,7 +104,7 @@ Start
module = "gid_Module_Brand_Prg_Base"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......@@ -118,7 +118,7 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer"
requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res %PACKAGEVERSION %PACKAGEVERSION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer %PACKAGEVERSION %PACKAGEVERSION"
solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
......
setup_native/source/packinfo/packinfo_office.txt
Dosyayı görüntüle @ d07cbe86
This source diff could not be displayed because it is too large. You can view the blob instead.
setup_native/source/packinfo/packinfo_office_help.txt
Dosyayı görüntüle @ d07cbe86
......@@ -40,7 +40,7 @@ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRI
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help"
provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION"
copyright = "2012 The Document Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation"
......
setup_native/source/packinfo/packinfo_sdkoo.txt
Dosyayı görüntüle @ d07cbe86
......@@ -22,7 +22,7 @@ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-sdk"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-sdk"
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"
......
setup_native/source/packinfo/packinfo_test.txt
Dosyayı görüntüle @ d07cbe86
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment