Kaydet (Commit) 7cf786c5 authored tarafından Petr Mladek's avatar Petr Mladek

rename libreoffice-ure package to libreoffice-ure3

we removed the 3rd layer, so the extra package name does not longer makes sense;
it causes conflict with distro specific packages that are not versioned;
discussed on the mailing list
üst 1a1cc219
%SOLSUREPACKAGEPREFIX-ure UNO Runtime Environment %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure UNO Runtime Environment
SUNWcar Core Architecture, (Root) SUNWcar Core Architecture, (Root)
SUNWcsd Core Solaris Devices SUNWcsd Core Solaris Devices
SUNWcsl Core Solaris, (Shared Libs) SUNWcsl Core Solaris, (Shared Libs)
......
...@@ -30,8 +30,8 @@ module = "gid_Module_Root_Brand" ...@@ -30,8 +30,8 @@ module = "gid_Module_Root_Brand"
# script = "shellscripts_brand.txt" # script = "shellscripts_brand.txt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION" solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")"
copyright = "1999-2009 by %PRODUCTNAME" copyright = "1999-2009 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile" solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME" vendor = "%PRODUCTNAME"
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
Start Start
module = "gid_Module_Root" module = "gid_Module_Root"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
solarisrequires = "SUNWzlibr" solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
copyright = "1999-2009 by OpenOffice.org" copyright = "1999-2009 by OpenOffice.org"
solariscopyright = "solariscopyrightfile" solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation" vendor = "The Document Foundation"
...@@ -40,9 +40,9 @@ End ...@@ -40,9 +40,9 @@ End
Start Start
module = "gid_Module_Root_Ure_Hidden" module = "gid_Module_Root_Ure_Hidden"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
solarisrequires = "SUNWzlibr" solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
copyright = "2005-1999-2009 by OpenOffice.org" copyright = "2005-1999-2009 by OpenOffice.org"
solariscopyright = "solariscopyrightfile" solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation" vendor = "The Document Foundation"
......
...@@ -8,12 +8,12 @@ END ...@@ -8,12 +8,12 @@ END
platform=`uname -s` platform=`uname -s`
case $$platform in case $$platform in
SunOS) SunOS)
UREPACKAGE=SOLSUREPACKAGEPREFIX-ure UREPACKAGE=SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
UREDIR=`pkginfo -r $$UREPACKAGE` UREDIR=`pkginfo -r $$UREPACKAGE`
PRODUCTINSTALLLOCATION="$$BASEDIR" PRODUCTINSTALLLOCATION="$$BASEDIR"
;; ;;
Linux) Linux)
UREPACKAGE=UREPACKAGEPREFIX-ure UREPACKAGE=UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
UREDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$UREPACKAGE` UREDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$UREPACKAGE`
PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX" PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
;; ;;
......
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