rpms/openoffice.org/devel openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch, 1.2, 1.3

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17454

Modified Files:
	openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch 
Log Message:
this renaming a langpack business is trickier than it looks

openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch:

Index: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch	11 Jan 2008 16:29:36 -0000	1.2
+++ openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch	11 Jan 2008 17:54:08 -0000	1.3
@@ -8,18 +8,69 @@
 +completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh-YU sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
  
  alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
-Index: util/pack.lst
+Index: source/ooo/module_langpack.scp
 ===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/pack.lst,v
-retrieving revision 1.24.24.6
-diff -u -r1.24.24.6 pack.lst
---- openoffice.org.orig/instsetoo_native/util/pack.lst	8 Nov 2007 16:01:22 -0000	1.24.24.6
-+++ openoffice.org/instsetoo_native/util/pack.lst	11 Jan 2008 16:28:01 -0000
-@@ -17,6 +17,6 @@
- OpenOffice_SDK          unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   en-US   sdkoo
- BrOffice_SDK            unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   pt-BR   sdkbro
- URE                     unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   en-US   ure
--OpenOfficeLanguagepack  unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   af|ar|as-IN|be-BY|bg|br|bs|ca|cs|da|de|dz|el|en-GB|en-US|en-ZA|es|et|fi|fr|ga|gl|gu|he|hi-IN|hr|hu|it|ja|ka|km|ko|lt|mk|ml-IN|mr-IN|nb|ne|nl|nn|nr|ns|or-IN|pa-IN|pl|pt|ru|rw|sh-YU|sk|sl|sr-CS|ss|st|sv|sw-TZ|ta|te-IN|tg|th|ti-ER|tr|ts|uk|ur-IN|ve|vi|xh|zh-CN|zh-TW|zu   ooolanguagepack
-+OpenOfficeLanguagepack  unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   af|ar|as-IN|be-BY|bg|br|bs|ca|cs|da|de|dz|el|en-GB|en-US|en-ZA|es|et|fi|fr|ga|gl|gu|he|hi-IN|hr|hu|it|ja|ka|km|ko|lt|mk|ml-IN|mr-IN|nb|ne|nl|nn|nr|ns|or-IN|pa-IN|pl|pt|ru|rw|sh-YU|sk|sl|sr|ss|st|sv|sw-TZ|ta|te-IN|tg|th|ti-ER|tr|ts|uk|ur-IN|ve|vi|xh|zh-CN|zh-TW|zu   ooolanguagepack
- BrOfficeLanguagepack    unxsols4.pro,unxsoli4.pro,unxlngi6.pro,wntmsci10.pro   pt-BR   broolanguagepack
+RCS file: /cvs/installation/scp2/source/ooo/module_langpack.scp,v
+retrieving revision 1.7
+diff -u -r1.7 module_langpack.scp
+--- openoffice.org.orig/scp2/source/ooo/module_langpack.scp	6 Nov 2007 14:20:24 -0000	1.7
++++ openoffice.org/scp2/source/ooo/module_langpack.scp	11 Jan 2008 17:51:56 -0000
+@@ -3465,9 +3465,9 @@
+ End
+ #endif
  
+-// Serbian (Cyrillic) (sr-CS)
++// Serbian (Cyrillic) (sr)
+ 
+-Module gid_Module_Root_sr_CS
++Module gid_Module_Root_sr
+ 	LanguagePackageInfo = "packinfo_office_lang.txt";
+     ParentID = gid_Module_Langpack_Base;
+     Sortkey = "7600";
+@@ -3478,34 +3478,34 @@
+ End
+ 
+ #ifndef WNT
+-Module gid_Module_Langpack_Resource_sr_CS
++Module gid_Module_Langpack_Resource_sr
+ 	LanguagePackageInfo = "packinfo_office_lang.txt";
+-    ParentID = gid_Module_Root_sr_CS;
++    ParentID = gid_Module_Root_sr;
+     Sortkey = "100";
+-    Name = "gid_Module_Langpack_Resource_sr_CS";
+-    Description = "gid_Module_Langpack_Resource_sr_CS";
++    Name = "gid_Module_Langpack_Resource_sr";
++    Description = "gid_Module_Langpack_Resource_sr";
+     Styles = (HIDDEN_ROOT);
+ End
+ #endif
+ 
+ #ifndef WNT
+-Module gid_Module_Langpack_Help_sr_CS
++Module gid_Module_Langpack_Help_sr
+ 	LanguagePackageInfo = "packinfo_office_lang.txt";
+-    ParentID = gid_Module_Root_sr_CS;
++    ParentID = gid_Module_Root_sr;
+     Sortkey = "200";
+-    Name = "gid_Module_Langpack_Help_sr_CS";
+-    Description = "gid_Module_Langpack_Help_sr_CS";
++    Name = "gid_Module_Langpack_Help_sr";
++    Description = "gid_Module_Langpack_Help_sr";
+     Styles = (HIDDEN_ROOT);
+ End
+ #endif
+ 
+ #ifndef WNT
+-Module gid_Module_Langpack_Fonts_sr_CS
++Module gid_Module_Langpack_Fonts_sr
+ 	LanguagePackageInfo = "packinfo_office_lang.txt";
+-    ParentID = gid_Module_Root_sr_CS;
++    ParentID = gid_Module_Root_sr;
+     Sortkey = "300";
+-    Name = "gid_Module_Langpack_Fonts_sr_CS";
+-    Description = "gid_Module_Langpack_Fonts_sr_CS";
++    Name = "gid_Module_Langpack_Fonts_sr";
++    Description = "gid_Module_Langpack_Fonts_sr";
+     Styles = (HIDDEN_ROOT);
+ End
+ #endif