diff options
Diffstat (limited to 'editors/openoffice.org-3-RC/files/patch-instsetoo')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-instsetoo | 113 |
1 files changed, 57 insertions, 56 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-instsetoo b/editors/openoffice.org-3-RC/files/patch-instsetoo index 1aa1622f2517..c9cebc0a5c3a 100644 --- a/editors/openoffice.org-3-RC/files/patch-instsetoo +++ b/editors/openoffice.org-3-RC/files/patch-instsetoo @@ -1,4 +1,4 @@ -Issutracker : #iXXXXX# +Issutracker : #i53288# CWS : N/A Author: : <maho@openoffice.org> (JCA) Description : remove circular dependency @@ -10,91 +10,92 @@ and pkg_add command is forked infinite times and eats up systems' resource. namely when core01 tries to install core02, core02 also tries to install core01. + Index: instsetoo_native/inc_openoffice/unix/packagelist.txt =================================================================== RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v -retrieving revision 1.14 -diff -u -r1.14 packagelist.txt ---- instsetoo_native/inc_openoffice/unix/packagelist.txt 21 Jun 2005 13:15:49 -0000 1.14 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 23 Jun 2005 01:11:03 -0000 -@@ -33,7 +33,7 @@ - solarispackagename = "openofficeorg-core01" - solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" - packagename = "openofficeorg-core01" --requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" -+requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" +retrieving revision 1.15 +diff -u -r1.15 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 18 Aug 2005 12:48:34 -0000 1.15 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 22 Aug 2005 07:01:29 -0000 +@@ -38,7 +38,7 @@ + packagename = "openoffice.org-core01" + linuxreplaces = "openofficeorg-core,openofficeorg-core01" + provides = "openofficeorg-core01" +-requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08" ++requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -238,7 +238,6 @@ - solarispackagename = "openofficeorg-core02" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core02" --requires = "openofficeorg-core01" +@@ -284,7 +284,6 @@ + packagename = "openoffice.org-core02" + linuxreplaces = "openofficeorg-core02" + provides = "openofficeorg-core02" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -250,7 +249,6 @@ - solarispackagename = "openofficeorg-core03" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core03" --requires = "openofficeorg-core01" +@@ -298,7 +297,6 @@ + packagename = "openoffice.org-core03" + linuxreplaces = "openofficeorg-core03" + provides = "openofficeorg-core03" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -262,7 +260,6 @@ - solarispackagename = "openofficeorg-core04" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core04" --requires = "openofficeorg-core01" +@@ -312,7 +310,6 @@ + packagename = "openoffice.org-core04" + linuxreplaces = "openofficeorg-core04" + provides = "openofficeorg-core04" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -274,7 +271,6 @@ - solarispackagename = "openofficeorg-core05" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core05" --requires = "openofficeorg-core01" +@@ -326,7 +323,6 @@ + packagename = "openoffice.org-core05" + linuxreplaces = "openofficeorg-core05" + provides = "openofficeorg-core05" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -286,7 +282,6 @@ - solarispackagename = "openofficeorg-core06" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core06" --requires = "openofficeorg-core01" +@@ -340,7 +336,6 @@ + packagename = "openoffice.org-core06" + linuxreplaces = "openofficeorg-core06" + provides = "openofficeorg-core06" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -298,7 +293,6 @@ - solarispackagename = "openofficeorg-core07" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core07" --requires = "openofficeorg-core01" +@@ -354,7 +349,6 @@ + packagename = "openoffice.org-core07" + linuxreplaces = "openofficeorg-core07" + provides = "openofficeorg-core07" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -310,7 +304,6 @@ - solarispackagename = "openofficeorg-core08" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core08" --requires = "openofficeorg-core01" +@@ -368,7 +362,6 @@ + packagename = "openoffice.org-core08" + linuxreplaces = "openofficeorg-core08" + provides = "openofficeorg-core08" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -322,7 +315,6 @@ - solarispackagename = "openofficeorg-core09" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core09" --requires = "openofficeorg-core01" +@@ -382,7 +375,6 @@ + packagename = "openoffice.org-core09" + linuxreplaces = "openofficeorg-core09" + provides = "openofficeorg-core09" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -335,7 +327,6 @@ - solarispackagename = "openofficeorg-core10" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core10" --requires = "openofficeorg-core01" +@@ -397,7 +389,6 @@ + packagename = "openoffice.org-core10" + linuxreplaces = "openofficeorg-core10" + provides = "openofficeorg-core10" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" |